From 77b9043a582dd1b216794c11ee74d1d63416a127 Mon Sep 17 00:00:00 2001
From: marco <5336-marco-guest@users.noreply.salsa.debian.org>
Date: Wed, 25 Jan 2023 10:26:19 +0000
Subject: [PATCH 001/349] Delete ubuntu-groovy.diff

Already done in commit 31ed5880c001eb164c7d675b81f9472f7018106e, but
accidentally re-introduced in a later merge
---
 debian/patches/ubuntu-groovy.diff | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 debian/patches/ubuntu-groovy.diff

diff --git a/debian/patches/ubuntu-groovy.diff b/debian/patches/ubuntu-groovy.diff
deleted file mode 100644
index 800a70a8..00000000
--- a/debian/patches/ubuntu-groovy.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/clang/include/clang/Driver/Distro.h
-+++ b/clang/include/clang/Driver/Distro.h
-@@ -67,6 +67,7 @@ public:
-     UbuntuDisco,
-     UbuntuEoan,
-     UbuntuFocal,
-+    UbuntuGroovy,
-     UnknownDistro
-   };
- 
-@@ -120,7 +121,7 @@ public:
-   }
- 
-   bool IsUbuntu() const {
--    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuFocal;
-+    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuGroovy;
-   }
- 
-   bool IsAlpineLinux() const {
---- a/clang/lib/Driver/Distro.cpp
-+++ b/clang/lib/Driver/Distro.cpp
-@@ -70,6 +70,7 @@ static Distro::DistroType DetectDistro(l
-                       .Case("disco", Distro::UbuntuDisco)
-                       .Case("eoan", Distro::UbuntuEoan)
-                       .Case("focal", Distro::UbuntuFocal)
-+                      .Case("groovy", Distro::UbuntuGroovy)
-                       .Default(Distro::UnknownDistro);
-     if (Version != Distro::UnknownDistro)
-       return Version;

From 2c2a5742f64e4420a2ab26731528754f26a8c57d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 26 Jan 2023 10:34:16 +0100
Subject: [PATCH 002/349] update of the version

---
 debian/unpack.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/unpack.sh b/debian/unpack.sh
index 66bae736..50beaf17 100644
--- a/debian/unpack.sh
+++ b/debian/unpack.sh
@@ -1,6 +1,6 @@
 set -e
 ORIG_VERSION=snapshot
-MAJOR_VERSION=16 # 8.0.1
+MAJOR_VERSION=17 # 8.0.1
 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;'  | sort -ru`
 
 VERSION=$REV

From 0775511df2620dffa2b8f9201d90b6a4038d6696 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 26 Jan 2023 14:17:11 +0100
Subject: [PATCH 003/349] update of the changelog

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bce35fc3..af0827df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-llvm-toolchain-snapshot (1:16~++20230115053056+df5fc4504b86-1~exp1) experimental; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230115053056+df5fc4504b86-1~exp1) experimental; urgency=medium
 
-  * TODO update of the content
+  * Snapshot is now 17
   * ship libHLFIRTransforms & libHLFIRDialect in libflang
   * Also install liborc_rt-x86_64.a in libclang-rt
   * Adjust some path since upstream changed the path from

From 440420db5e46f0fe0118f3e27b8b7e3278935515 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 26 Jan 2023 14:28:19 +0100
Subject: [PATCH 004/349] rebase of the patches

---
 debian/patches/openmp-fix-runtimes-build.diff | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index a80cd5da..ccd61cb2 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -1,11 +1,11 @@
 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~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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)
+--- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/llvm/runtimes/CMakeLists.txt
+@@ -233,6 +233,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}
                                        -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS}
@@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CM
                                        -DCMAKE_C_COMPILER_WORKS=ON
                                        -DCMAKE_CXX_COMPILER_WORKS=ON
                                        -DCMAKE_ASM_COMPILER_WORKS=ON
-@@ -465,7 +466,7 @@ if(runtimes)
+@@ -480,7 +481,7 @@ if(runtimes)
      # build directory cannot find the C++ headers in certain configurations.
      # I need to build a mechanism for runtime projects to provide CMake code
      # that executes at LLVM configuration time to handle this case.
@@ -22,11 +22,11 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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~++20220920091612+a7d2409bac7f/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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()
+--- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/CMakeLists.txt
+@@ -91,6 +91,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
  
@@ -55,10 +55,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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~++20220920091612+a7d2409bac7f/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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
+--- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -68,24 +68,24 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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~++20220920091612+a7d2409bac7f/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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)
+--- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+@@ -56,6 +56,8 @@ add_dependencies(omptarget.rtl.cuda ompt
+ target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
+ target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
 +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda)
 +
  # 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~++20220920091612+a7d2409bac7f/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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
+--- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/libomptarget/src/CMakeLists.txt
+@@ -35,7 +35,9 @@ add_llvm_library(omptarget
    PRIVATE
    "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
    NO_INSTALL_RPATH
@@ -96,10 +96,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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~++20220920091612+a7d2409bac7f/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -111,11 +111,11 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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~++20220920091612+a7d2409bac7f/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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()
+--- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/runtime/src/CMakeLists.txt
+@@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
    set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
@@ -123,7 +123,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/runtime/s
  else()
    set(LIBOMP_LINKER_LANGUAGE CXX)
  endif()
-@@ -196,6 +197,8 @@ else()
+@@ -201,6 +202,8 @@ else()
    )
  endif()
  
@@ -132,10 +132,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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~++20220920091612+a7d2409bac7f/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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
+--- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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)

From 49661aa2d9a93682d229284c431bfbec4958eae2 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 27 Jan 2023 09:11:35 +0100
Subject: [PATCH 005/349] rebase of the patches

---
 debian/patches/openmp-fix-runtimes-build.diff | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index ccd61cb2..e2d1ca89 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_17~++20230126021740+85395af27241/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/llvm/runtimes/CMakeLists.txt
 @@ -233,6 +233,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_17~++20230126021740+85395af27241/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_17~++20230126021740+85395af27241/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/CMakeLists.txt
 @@ -91,6 +91,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
@@ -55,10 +55,10 @@ Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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_17~++20230126021740+85395af27241/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/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_17~++20230126021740+85395af27241/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -56,6 +56,8 @@ add_dependencies(omptarget.rtl.cuda ompt
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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_17~++20230126021740+85395af27241/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/libomptarget/src/CMakeLists.txt
 @@ -35,7 +35,9 @@ add_llvm_library(omptarget
    PRIVATE
    "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
@@ -96,10 +96,10 @@ Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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_17~++20230126021740+85395af27241/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/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_17~++20230126021740+85395af27241/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_17~++20230126021740+85395af27241/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/runtime/src/CMakeLists.txt
 @@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -132,12 +132,12 @@ Index: llvm-toolchain-snapshot_17~++20230126021740+85395af27241/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_17~++20230126021740+85395af27241/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230126021740+85395af27241.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230126021740+85395af27241/openmp/tools/archer/CMakeLists.txt
-@@ -14,6 +14,9 @@ if(LIBOMP_OMPT_SUPPORT)
-   add_library(archer SHARED ompt-tsan.cpp)
+--- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/tools/archer/CMakeLists.txt
+@@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT)
+   target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)
  
 +  add_runtimes_build_depends_if_needed(archer)

From edfc1e79cfc0e0886d3f2f5351a5b09ddc8de25d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 28 Jan 2023 17:19:11 +0100
Subject: [PATCH 006/349] debug info

---
 debian/rules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/rules b/debian/rules
index 4fb91d4f..4e826a2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -495,6 +495,8 @@ RUNTIMES_LIST := $(shell echo "$(RUNTIMES)"|sed -e "s| ||g")
 
 preconfigure:
 
+	dh_listpackages
+
 	if ! grep -qs '/proc ' /proc/mounts; then \
 		echo "/proc needs to be mounted"; \
 		exit 1; \

From d5738a029c8bf7159cc0f056bf9eb3d45dc81f9d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 28 Jan 2023 17:30:19 +0100
Subject: [PATCH 007/349] refresh the control

---
 debian/control | 228 ++++++++++++++++++++++++-------------------------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/debian/control b/debian/control
index a424f2a8..ead965e1 100644
--- a/debian/control
+++ b/debian/control
@@ -40,16 +40,16 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot
 
 # ------------- clang -------------
 
-Package: clang-16
+Package: clang-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-16-dev (= ${source:Version}),
- llvm-16-linker-tools (= ${binary:Version}),
- libclang1-16 (= ${binary:Version}), libc6-dev, binutils
+ ${dep:devlibs-objc}, libclang-common-17-dev (= ${source:Version}),
+ llvm-17-linker-tools (= ${binary:Version}),
+ libclang1-17 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
-Recommends: llvm-16-dev, python3
-# libomp-16-dev
-Suggests: clang-16-doc, wasi-libc
+Recommends: llvm-17-dev, python3
+# libomp-17-dev
+Suggests: clang-17-doc, wasi-libc
 Description: C, C++ and Objective-C compiler
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -58,9 +58,9 @@ Description: C, C++ and Objective-C compiler
  Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also
  provides most of the support of C++20.
 
-Package: clang-tools-16
+Package: clang-tools-17
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, clang-16 (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang-17 (= ${binary:Version}),
  python3
 Description: clang-based tools for C/C++ developments
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -72,10 +72,10 @@ Description: clang-based tools for C/C++ developments
  .
  This package contains some clang-based tools like scan-build, clang-cl, etc.
 
-Package: clang-format-16
+Package: clang-format-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm16 (= ${binary:Version})
+ libllvm17 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
  Clang-format is both a library and a stand-alone tool with the goal of
  automatically reformatting C++ sources files according to configurable
@@ -88,21 +88,21 @@ Description: Tool to format C/C++/Obj-C code
  .
  This package also provides vim and emacs plugins.
 
-Package: clang-tidy-16
+Package: clang-tidy-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm16 (= ${binary:Version}), libclang-common-16-dev,
- clang-tools-16, python3-yaml
+ libllvm17 (= ${binary:Version}), libclang-common-17-dev,
+ clang-tools-17, python3-yaml
 Description: clang-based C++ linter tool
  Provide an extensible framework for diagnosing and fixing typical programming
  errors, like style violations, interface misuse, or bugs that can be deduced
  via static analysis. clang-tidy is modular and provides a convenient interface
  for writing new checks.
 
-Package: clangd-16
+Package: clangd-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libclang-common-16-dev (= ${source:Version})
+ libclang-common-17-dev (= ${source:Version})
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
   - code completion
@@ -113,7 +113,7 @@ Description: Language server that provides IDE-like features to editors
  clangd is a language server that implements the Language Server Protocol;
  it can work with many editors through a plugin.
 
-Package: clang-16-doc
+Package: clang-17-doc
 Architecture: all
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax
@@ -127,7 +127,7 @@ Description: C, C++ and Objective-C compiler - Documentation
  .
  This package contains the documentation.
 
-Package: libclang1-16
+Package: libclang1-17
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -148,12 +148,12 @@ Description: C interface to the Clang library
  locations with elements within the AST, and other facilities that support
  Clang-based development tools.
 
-Package: libclang-16-dev
+Package: libclang-17-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang1-16 (= ${binary:Version}),
- libclang-common-16-dev (= ${source:Version})
+ ${dep:devlibs-objc}, libclang1-17 (= ${binary:Version}),
+ libclang-common-17-dev (= ${source:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -163,13 +163,13 @@ Description: Clang library - Development package
  provides most of the support of C++20.
  .
  This package contains the Clang headers to develop extensions over
- libclang1-16.
+ libclang1-17.
 
-Package: libclang-common-16-dev
+Package: libclang-common-17-dev
 Architecture: all
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (>= ${source:Version})
-Recommends: libclang-rt-16-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (>= ${source:Version})
+Recommends: libclang-rt-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -182,12 +182,12 @@ Description: Clang library - Common development package
 
 # ------------- compiler-rt -------------
 
-Package: libclang-rt-16-dev
+Package: libclang-rt-17-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Compiler-rt - development package
  This package provides various libraries:
@@ -200,36 +200,36 @@ Description: Compiler-rt - development package
      DataFlowSanitizer, etc
    * profile - Library which is used to collect coverage information.
 
-Package: libclang-rt-16-dev-wasm32
+Package: libclang-rt-17-dev-wasm32
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libclang-common-16-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Recommends: libclang-common-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Compiler-rt - wasm32 builtins
  Provides the compiler-rt builtins for WebAssembly 32 bits
 
-Package: libclang-rt-16-dev-wasm64
+Package: libclang-rt-17-dev-wasm64
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libclang-common-16-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Recommends: libclang-common-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Compiler-rt - wasm64 builtins
  Provides the compiler-rt builtins for WebAssembly 64 bits
 
 # ------------- polly -------------
 
-Package: libpolly-16-dev
+Package: libpolly-17-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
+Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: High-level loop and data-locality optimizer
  Uses an abstract mathematical representation based on integer polyhedra
@@ -237,10 +237,10 @@ Description: High-level loop and data-locality optimizer
 
 # ------------- clang libraries -------------
 
-Package: libclang-cpp16
+Package: libclang-cpp17
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -258,12 +258,12 @@ Description: C++ interface to the Clang library
  locations with elements within the AST, and other facilities that support
  Clang-based development tools.
 
-Package: libclang-cpp16-dev
+Package: libclang-cpp17-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-cpp16 (= ${binary:Version})
-# Move of libclang-cpp.so into libclang-cpp16.dev
+ libclang-cpp17 (= ${binary:Version})
+# Move of libclang-cpp.so into libclang-cpp17.dev
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -284,10 +284,10 @@ Description: C++ interface to the Clang library
  linker at build time.
 
 
-Package: libfuzzer-16-dev
+Package: libfuzzer-17-dev
 Architecture: linux-any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, clang-16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang-17 (= ${binary:Version})
 Description: Library for coverage-guided fuzz testing
  LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing
  of other libraries.
@@ -305,10 +305,10 @@ Description: Library for coverage-guided fuzz testing
  instrumentation.
 
 
-Package: python3-clang-16
+Package: python3-clang-17
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-16-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-17-dev
 Replaces: python-clang-x.y,
 Conflicts: python-clang-x.y
 Provides: python-clang-x.y
@@ -322,7 +322,7 @@ Description: Clang Python Bindings
  .
  This binding package provides access to the Clang compiler and libraries.
 
-Package: clang-16-examples
+Package: clang-17-examples
 Architecture: any
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -338,7 +338,7 @@ Description: Clang examples
 
 # ------------- LLVM -------------
 
-Package: libllvm16
+Package: libllvm17
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -351,7 +351,7 @@ Description: Modular compiler and toolchain technologies, runtime library
  .
  This package contains the LLVM runtime library.
 
-Package: llvm-16-linker-tools
+Package: llvm-17-linker-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Modular compiler and toolchain technologies - Plugins
@@ -361,13 +361,13 @@ Description: Modular compiler and toolchain technologies - Plugins
  .
  This package contains the LLVMgold and LLVMPolly linker plugins.
 
-Package: llvm-16
+Package: llvm-17
 Architecture: any
-Suggests: llvm-16-doc
-Depends: llvm-16-runtime (= ${binary:Version}),
- llvm-16-linker-tools (= ${binary:Version}),
+Suggests: llvm-17-doc
+Depends: llvm-17-runtime (= ${binary:Version}),
+ llvm-17-linker-tools (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
-Recommends: llvm-16-dev
+Recommends: llvm-17-dev
 Description: Modular compiler and toolchain technologies
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
@@ -391,7 +391,7 @@ Description: Modular compiler and toolchain technologies
  a young scheme front-end, and Java support is in development. LLVM can
  generate code for X96, SparcV10, PowerPC or many other architectures.
 
-Package: llvm-16-runtime
+Package: llvm-17-runtime
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: binfmt-support | systemd
@@ -411,11 +411,11 @@ Description: Modular compiler and toolchain technologies, IR interpreter
  This package provides the minimal required to execute programs in LLVM
  format.
 
-Package: llvm-16-dev
+Package: llvm-17-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
- llvm-16 (= ${binary:Version}), libllvm16 (= ${binary:Version}), libtinfo-dev,
- llvm-16-tools (= ${binary:Version}), libclang-cpp16 (= ${binary:Version}),
+ llvm-17 (= ${binary:Version}), libllvm17 (= ${binary:Version}), libtinfo-dev,
+ llvm-17-tools (= ${binary:Version}), libclang-cpp17 (= ${binary:Version}),
  libz3-dev, libxml2-dev
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
@@ -433,7 +433,7 @@ Description: Modular compiler and toolchain technologies, libraries and headers
  This package provides the libraries and headers to develop applications
  using llvm.
 
-Package: llvm-16-tools
+Package: llvm-17-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
  python3-pygments, python3-yaml,
@@ -453,11 +453,11 @@ Description: Modular compiler and toolchain technologies, tools
  .
  This package provides tools for testing.
 
-Package: libllvm-16-ocaml-dev
+Package: libllvm-17-ocaml-dev
 Section: ocaml
 Architecture: amd64 arm64 armhf ppc64el s390x riscv64
-Suggests: llvm-16-doc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-16-dev (= ${binary:Version})
+Suggests: llvm-17-doc
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-17-dev (= ${binary:Version})
 Replaces: libllvm-x.y-ocaml-dev
 Conflicts: libllvm-x.y-ocaml-dev
 Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev
@@ -476,7 +476,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings
  .
  This package provides the OCaml bindings to develop applications using llvm.
 
-Package: llvm-16-doc
+Package: llvm-17-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
@@ -495,10 +495,10 @@ Description: Modular compiler and toolchain technologies, documentation
  .
  This package contains all documentation (extensive).
 
-Package: llvm-16-examples
+Package: llvm-17-examples
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, llvm-16-dev (>= ${source:Version}), llvm-16-dev (<< ${source:Version}+c~)
+Depends: ${misc:Depends}, llvm-17-dev (>= ${source:Version}), llvm-17-dev (<< ${source:Version}+c~)
 Description: Modular compiler and toolchain technologies, examples
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
@@ -518,20 +518,20 @@ Description: Modular compiler and toolchain technologies, examples
 
 # ------------- lld -------------
 
-Package: lld-16
+Package: lld-17
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker
  LLD is a new, high-performance linker. It is built as a set of reusable
  components which highly leverage existing libraries in the larger LLVM
  Project.
 
-Package: liblld-16
+Package: liblld-17
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: LLVM-based linker, library
@@ -541,12 +541,12 @@ Description: LLVM-based linker, library
  .
  This package contains the LLD runtime library.
 
-Package: liblld-16-dev
+Package: liblld-17-dev
 Section: libdevel
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, lld-16 (= ${binary:Version}),
- liblld-16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, lld-17 (= ${binary:Version}),
+ liblld-17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker, header files
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -558,21 +558,21 @@ Description: LLVM-based linker, header files
 
 # ------------- lldb -------------
 
-Package: lldb-16
+Package: lldb-17
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version}), llvm-16-dev,
- python3-lldb-16
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}), llvm-17-dev,
+ python3-lldb-17
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
  LLDB is a next generation, high-performance debugger. It is built as a set of
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: liblldb-16
+Package: liblldb-17
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: Next generation, high-performance debugger, library
@@ -582,11 +582,11 @@ Description: Next generation, high-performance debugger, library
  .
  This package contains the LLDB runtime library.
 
-Package: python3-lldb-16
+Package: python3-lldb-17
 Section: python
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-16 (= ${binary:Version}), python3-six
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-17 (= ${binary:Version}), python3-six
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y
@@ -598,11 +598,11 @@ Description: Next generation, high-performance debugger, python3 lib
  .
  This binding package provides access to lldb.
 
-Package: liblldb-16-dev
+Package: liblldb-17-dev
 Section: libdevel
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger, header files
  LLDB is a next generation, high-performance debugger. It is built as a set of
@@ -616,11 +616,11 @@ Description: Next generation, high-performance debugger, header files
 # 44 because it was the first version in which openmp & libc++ have been
 # managed in llvm-defaults
 
-Package: libomp-16-dev
+Package: libomp-17-dev
 Section: libdevel
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
-Depends: libomp5-16 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libomp-16-doc
+Depends: libomp5-17 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: libomp-17-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
 Provides: libomp-x.y-dev
 Conflicts: libomp-x.y-dev
@@ -630,7 +630,7 @@ Description: LLVM OpenMP runtime - dev package
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp5-16
+Package: libomp5-17
 Multi-Arch: same
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -643,7 +643,7 @@ Description: LLVM OpenMP runtime
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp-16-doc
+Package: libomp-17-doc
 Section: doc
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
@@ -658,7 +658,7 @@ Description: LLVM OpenMP runtime - Documentation
 
 # ------------- libcxx -------------
 
-Package: libc++1-16
+Package: libc++1-17
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -682,12 +682,12 @@ Description: LLVM C++ Standard library
      as exception objects, rtti and memory allocation.
    * Extensive unit tests.
 
-Package: libc++-16-dev
+Package: libc++-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends},
- libunwind-16-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64]
+Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends},
+ libunwind-17-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -705,11 +705,11 @@ Description: LLVM C++ Standard library (development files)
      as exception objects, rtti and memory allocation.
    * Extensive unit tests.
 
-Package: libc++-16-dev-wasm32
+Package: libc++-17-dev-wasm32
 Section: libdevel
 Architecture: all
 Multi-Arch: foreign
-Depends: wasi-libc, libc++abi-16-dev-wasm32, ${misc:Depends}
+Depends: wasi-libc, libc++abi-17-dev-wasm32, ${misc:Depends}
 Provides: libc++-x.y-dev-wasm32
 Conflicts: libc++-x.y-dev-wasm32
 Replaces: libc++-x.y-dev-wasm32
@@ -730,7 +730,7 @@ Description: LLVM C++ Standard library (WASI)
 
 # ------------- libcxxabi -------------
 
-Package: libc++abi1-16
+Package: libc++abi1-17
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -749,11 +749,11 @@ Description: LLVM low level support for a standard C++ library
    * Correctness as defined by the C++ standards.
    * Provide a portable sublayer to ease the porting of libc++
 
-Package: libc++abi-16-dev
+Package: libc++abi-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++abi1-16 (= ${binary:Version}), ${misc:Depends}
+Depends: libc++abi1-17 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++abi-dev (<= 44)
 Provides: libc++abi-x.y-dev
 Conflicts: libc++abi-x.y-dev
@@ -767,7 +767,7 @@ Description: LLVM low level support for a standard C++ library (development file
    * Correctness as defined by the C++ standards.
    * Provide a portable sublayer to ease the porting of libc++
 
-Package: libc++abi-16-dev-wasm32
+Package: libc++abi-17-dev-wasm32
 Section: libdevel
 Architecture: all
 Multi-Arch: foreign
@@ -788,14 +788,14 @@ Description: LLVM low level support for a standard C++ library (WASI)
 
 # ------------- libclc -------------
 
-Package: libclc-16
+Package: libclc-17
 Section: libs
 Architecture: all
 Multi-Arch: foreign
 Depends:
  ${misc:Depends},
- libclc-16-dev (= ${binary:Version}),
- libclang-common-16-dev,
+ libclc-17-dev (= ${binary:Version}),
+ libclang-common-17-dev,
 Breaks: libclc-amdgcn, libclc-ptx, libclc-r600
 Provides: libclc-x.y
 Conflicts: libclc-x.y
@@ -807,7 +807,7 @@ Description: OpenCL C language implementation - platform support
  This package contains support for the amdgcn (AMD GPU), PTX and r600
  platforms.
 
-Package: libclc-16-dev
+Package: libclc-17-dev
 Section: libdevel
 Architecture: all
 Multi-Arch: foreign
@@ -825,7 +825,7 @@ Description: OpenCL C language implementation - development files
 
 # ------------- libunwind -------------
 
-Package: libunwind-16
+Package: libunwind-17
 Section: libs
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
 Multi-Arch: same
@@ -842,13 +842,13 @@ Description: production-quality unwinder
  or to operate on another process (aka remote), but only the local path has
  been implemented. Remote unwinding remains as future work.
 
-Package: libunwind-16-dev
+Package: libunwind-17-dev
 Section: libdevel
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libunwind-16 (= ${binary:Version})
+ libunwind-17 (= ${binary:Version})
 Provides: libunwind-dev, libunwind-x.y-dev
 Conflicts: libunwind-dev, libunwind-x.y-dev
 Replaces: libunwind-dev, libunwind-x.y-dev
@@ -862,7 +862,7 @@ Description: production-quality unwinder
 
 # ------------- mlir -------------
 
-Package: mlir-16-tools
+Package: mlir-17-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Multi-Level Intermediate Representation tools
@@ -873,7 +873,7 @@ Description: Multi-Level Intermediate Representation tools
  .
  This package provides tools.
 
-Package: libmlir-16
+Package: libmlir-17
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -889,13 +889,13 @@ Description: Multi-Level Intermediate Representation library
  specific compilers, and aid in connecting existing compilers together.
 
 
-Package: libmlir-16-dev
+Package: libmlir-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libmlir-16 (= ${binary:Version})
+ libmlir-17 (= ${binary:Version})
 Breaks: libmlir-dev
 Provides: libmlir-x.y-dev
 Conflicts: libmlir-x.y-dev
@@ -909,16 +909,16 @@ Description: Multi-Level Intermediate Representation library
 
 # ------------- bolt -------------
 
-Package: bolt-16
+Package: bolt-17
 Architecture: amd64
 # Disable on arm64 because libbolt_rt_hugify.a isn't generated
-Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-16-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-17-dev (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Description: Post-link optimizer
  It achieves the improvements by optimizing application's code layout based on
  execution profile gathered by sampling profiler.
 
-Package: libbolt-16-dev
+Package: libbolt-17-dev
 Section: libdevel
 Architecture: amd64
 #arm64
@@ -929,7 +929,7 @@ Description: Post-link optimizer
 
 # ------------- flang -------------
 
-Package: flang-16
+Package: flang-17
 # no 32bit support
 # https://github.com/llvm/llvm-project/issues/59845
 Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64
@@ -942,7 +942,7 @@ Description: Fortran compiler
  While it is capable of generating executables for a number
  of examples, some functionalities are still missing.
 
-Package: libflang-16-dev
+Package: libflang-17-dev
 Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},

From 271e1d1128670aa180a44a3d36548a27d93d9558 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 28 Jan 2023 17:30:41 +0100
Subject: [PATCH 008/349] Revert "debug info"

This reverts commit edfc1e79cfc0e0886d3f2f5351a5b09ddc8de25d.
---
 debian/rules | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4e826a2b..4fb91d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -495,8 +495,6 @@ RUNTIMES_LIST := $(shell echo "$(RUNTIMES)"|sed -e "s| ||g")
 
 preconfigure:
 
-	dh_listpackages
-
 	if ! grep -qs '/proc ' /proc/mounts; then \
 		echo "/proc needs to be mounted"; \
 		exit 1; \

From 07c09b9d6c38fd8c766103e26784922af8399d5c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 28 Jan 2023 17:34:24 +0100
Subject: [PATCH 009/349] add a check to break the build if we don't find
 clang-X.Y

---
 debian/rules | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/rules b/debian/rules
index 4fb91d4f..0f67541c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -580,6 +580,14 @@ endif
 		sed -i -e "s|#grpc\ ||g" debian/libclang-$(LLVM_VERSION)-dev.install; \
 	fi
 
+	if ! dh_listpackages|grep -q clang-$(LLVM_VERSION); then \
+		echo "Could not find clang-$(LLVM_VERSION) in the list of packages"; \
+		echo "Refresh debian/control ?"; \
+		echo "Package list:"; \
+		dh_listpackages; \
+		exit 1; \
+	fi
+
 # Override this two targets. They are trying to manage the .in conversion for me
 override_dh_ocamlinit:
 override_dh_ocamlclean:

From c245e502fa3217f5d67695c1a34064ed04c35533 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 28 Jan 2023 18:08:08 +0100
Subject: [PATCH 010/349]  prepare upload

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af0827df..e2463433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-snapshot (1:17~++20230115053056+df5fc4504b86-1~exp1) experimental; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium
 
   * Snapshot is now 17
   * ship libHLFIRTransforms & libHLFIRDialect in libflang
@@ -19,7 +19,7 @@ llvm-toolchain-snapshot (1:17~++20230115053056+df5fc4504b86-1~exp1) experimental
   * compiler-rt: Only build liborc on amd64, i386 & arm64
   * Don't build omptarget on i386
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 19 Nov 2022 10:16:49 +0100
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 28 Jan 2023 18:07:40 +0100
 
 llvm-toolchain-snapshot (1:16~++20221111053703+a77a02aa5794-1~exp1) experimental; urgency=medium
 

From be8f84d14e5e1cca0f00dce5e6e8764ba0519f57 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 30 Jan 2023 09:31:31 +0100
Subject: [PATCH 011/349] update of the missing patch

---
 debian/patches/clang-analyzer-force-version.diff  | 4 ++--
 debian/patches/clang-format-version.diff          | 4 ++--
 debian/patches/clang-tidy-run-bin.diff            | 4 ++--
 debian/patches/fix-scan-view-path.diff            | 2 +-
 debian/patches/python-clangpath.diff              | 2 +-
 debian/patches/scan-build-clang-path.diff         | 2 +-
 debian/patches/scan-build-py-fix-default-bin.diff | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff
index 07b76900..e87071d7 100644
--- a/debian/patches/clang-analyzer-force-version.diff
+++ b/debian/patches/clang-analyzer-force-version.diff
@@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan
  
    $Clang = $ENV{'CLANG_CXX'};
 -  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; }
-+  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-16'; }
++  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-17'; }
  
    $IsCXX = 1
  }
@@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan
  
    $Clang = $ENV{'CLANG'};
 -  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
-+  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-16'; }
++  if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-17'; }
  
    $IsCXX = 0
  }
diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff
index 4e34cee9..a4c98fdb 100644
--- a/debian/patches/clang-format-version.diff
+++ b/debian/patches/clang-format-version.diff
@@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clan
                        '-style=file, but can not find the .clang-format'
                        'file to use.')
 -  parser.add_argument('-binary', default='clang-format',
-+  parser.add_argument('-binary', default='clang-format-16',
++  parser.add_argument('-binary', default='clang-format-17',
                        help='location of binary to use for clang-format')
    args = parser.parse_args()
  
@@ -26,7 +26,7 @@ Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clan
  
  (defcustom clang-format-executable
 -  (or (executable-find "clang-format")
-+  (or (executable-find "clang-format-16")
++  (or (executable-find "clang-format-17")
        "clang-format")
    "Location of the clang-format executable.
  
diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff
index 1c6ac5ad..aeaa9447 100644
--- a/debian/patches/clang-tidy-run-bin.diff
+++ b/debian/patches/clang-tidy-run-bin.diff
@@ -6,10 +6,10 @@ Index: llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab/clang-tools-extr
                        action='store_true', help='allow alpha checkers from '
                                                  'clang-analyzer.')
    parser.add_argument('-clang-tidy-binary', metavar='PATH',
-+                      default='clang-tidy-16',
++                      default='clang-tidy-17',
                        help='path to clang-tidy binary')
    parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
-+                      default='clang-apply-replacements-16',
++                      default='clang-apply-replacements-17',
                        help='path to clang-apply-replacements binary')
    parser.add_argument('-checks', default=None,
                        help='checks filter, when not specified, use clang-tidy '
diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff
index af85272e..1566f5a0 100644
--- a/debian/patches/fix-scan-view-path.diff
+++ b/debian/patches/fix-scan-view-path.diff
@@ -6,7 +6,7 @@ Index: llvm-toolchain-snapshot_16~++20200326162000+4673699a470/clang/tools/scan-
  kMaxPortsToTry = 100
  
  ###
-+BASE_DIR = '/usr/share/clang/scan-view-16'
++BASE_DIR = '/usr/share/clang/scan-view-17'
  
  
  def url_is_up(url):
diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff
index 5ccbb830..2c2571f8 100644
--- a/debian/patches/python-clangpath.diff
+++ b/debian/patches/python-clangpath.diff
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/bindings/p
              file = 'libclang.dll'
          else:
 -            file = 'libclang.so'
-+            file = 'libclang-16.so'
++            file = 'libclang-17.so'
  
          if Config.library_path:
              file = Config.library_path + '/' + file
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 1470d4c6..083bff48 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan
      $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
      if (!defined $Clang || ! -x $Clang) {
 -      $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
-+      $Clang = Cwd::realpath("/usr/lib/llvm-16/bin/clang");
++      $Clang = Cwd::realpath("/usr/lib/llvm-17/bin/clang");
        if (!defined $Clang || ! -x $Clang) {
          # When an Xcode toolchain is present, look for a clang in the sibling bin
          # of the parent of the bin directory. So if scan-build is at
diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff
index 0cda8a2d..22a6dfca 100644
--- a/debian/patches/scan-build-py-fix-default-bin.diff
+++ b/debian/patches/scan-build-py-fix-default-bin.diff
@@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06/clang/tools/scan
          metavar='<path>',
          dest='clang',
 -        default='clang',
-+        default='clang-16',
++        default='clang-17',
          help="""'%(prog)s' uses the 'clang' executable relative to itself for
          static analysis. One can override this behavior with this option by
          using the 'clang' packaged with Xcode (on OS X) or from the PATH.""")

From fa3d081a633c396771fbadbaf49e9bf5b8261a2f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 30 Jan 2023 09:33:51 +0100
Subject: [PATCH 012/349] update of the version

---
 debian/tests/control | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 2d82460d..1cff65f8 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,7 +2,7 @@ Test-Command: bash -v ./debian/qualify-clang.sh
 Depends: @, cmake, make, g++, file, dpkg-dev
 # Comment the dbgsym package because of bug #917528
 # dbgsym packages not being available in testing
-# clang-16-dbgsym, libclang1-16-dbgsym
+# clang-17-dbgsym, libclang1-17-dbgsym
 Restrictions: allow-stderr
 Architecture: amd64 arm64 i386
 
@@ -12,10 +12,10 @@ Restrictions: allow-stderr
 Architecture: amd64 arm64
 
 Tests: cmake-test
-Depends: gcc, build-essential, cmake, llvm-16-dev
+Depends: gcc, build-essential, cmake, llvm-17-dev
 
 Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)"
-Depends: python3-lldb-16
+Depends: python3-lldb-17
 
 Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)"
-Depends: python3-clang-16
+Depends: python3-clang-17

From 2b763504ad94d222113acff1deb4063a68ec5850 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 30 Jan 2023 09:35:05 +0100
Subject: [PATCH 013/349] update of the version

---
 debian/README                            | 2 +-
 debian/tests/cmake-test                  | 2 +-
 debian/tests/integration-test-suite-test | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/README b/debian/README
index aa6d4d2f..654ba44c 100644
--- a/debian/README
+++ b/debian/README
@@ -9,7 +9,7 @@ The current snapshot release is maintained in the "snapshot" branch.
 The easiest way to get all branches is probably to have one
 clone per version:
 
-for f in 14 15 snapshot; do
+for f in 14 15 16 snapshot; do
     git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f
 done
 
diff --git a/debian/tests/cmake-test b/debian/tests/cmake-test
index 65e1ef62..f97d01e7 100755
--- a/debian/tests/cmake-test
+++ b/debian/tests/cmake-test
@@ -2,7 +2,7 @@
 
 set -e
 
-LLVM_VERSION=16
+LLVM_VERSION=17
 
 # this is taken from libjsoncpp package
 # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we
diff --git a/debian/tests/integration-test-suite-test b/debian/tests/integration-test-suite-test
index c068782c..b3bd0a6e 100755
--- a/debian/tests/integration-test-suite-test
+++ b/debian/tests/integration-test-suite-test
@@ -2,7 +2,7 @@
 
 set -e
 
-LLVM_VERSION=16
+LLVM_VERSION=17
 
 # this is taken from libjsoncpp package
 # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we

From 77b87c43bd24330bf74ef0d717bc793a89768738 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 3 Feb 2023 23:44:53 +0100
Subject: [PATCH 014/349] rebase of the patches

---
 debian/patches/openmp-fix-runtimes-build.diff | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index e2d1ca89..17832e00 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -1,13 +1,13 @@
 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_17~++20230127091052+435225c6e2f8/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/llvm/runtimes/CMakeLists.txt
-@@ -233,6 +233,7 @@ function(runtime_default_target)
+--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
+@@ -231,6 +231,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}
+                                       -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR}
                                        -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS}
 +                                      -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}
                                        -DCMAKE_C_COMPILER_WORKS=ON
@@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/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_17~++20230127091052+435225c6e2f8/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
 @@ -91,6 +91,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
@@ -55,10 +55,10 @@ Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/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_17~++20230127091052+435225c6e2f8/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/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_17~++20230127091052+435225c6e2f8/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -56,6 +56,8 @@ add_dependencies(omptarget.rtl.cuda ompt
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/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_17~++20230127091052+435225c6e2f8/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
 @@ -35,7 +35,9 @@ add_llvm_library(omptarget
    PRIVATE
    "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
@@ -96,10 +96,10 @@ Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/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_17~++20230127091052+435225c6e2f8/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/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_17~++20230127091052+435225c6e2f8/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_17~++20230127091052+435225c6e2f8/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
 @@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -132,10 +132,10 @@ Index: llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/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_17~++20230127091052+435225c6e2f8/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230127091052+435225c6e2f8/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT)
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)

From 42cc6aa03c75982a83eaa3f32a486c2363076d6a Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Feb 2023 00:20:12 +0100
Subject: [PATCH 015/349] rebase of the patches

---
 debian/patches/python3-shebang.patch | 490 +++++++++++++--------------
 1 file changed, 240 insertions(+), 250 deletions(-)

diff --git a/debian/patches/python3-shebang.patch b/debian/patches/python3-shebang.patch
index 7aa4e1b6..e9353412 100644
--- a/debian/patches/python3-shebang.patch
+++ b/debian/patches/python3-shebang.patch
@@ -1,809 +1,799 @@
 Description: change all shebangs to Python3
  find . -name "*.py" -exec sed "s|\!/usr/bin/env python$|\!/usr/bin/env python3|g" -i {} \;
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  #=- run-find-all-symbols.py - Parallel find-all-symbols runner -*- python  -*-=#
  #
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  #===- clang-tidy-diff.py - ClangTidy Diff Checker -----------*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/bindings/python/examples/cindex/cindex-dump.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/bindings/python/examples/cindex/cindex-dump.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/bindings/python/examples/cindex/cindex-dump.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/bindings/python/examples/cindex/cindex-dump.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/bindings/python/examples/cindex/cindex-dump.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/bindings/python/examples/cindex/cindex-dump.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  #===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/bindings/python/examples/cindex/cindex-includes.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/bindings/python/examples/cindex/cindex-includes.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/bindings/python/examples/cindex/cindex-includes.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/bindings/python/examples/cindex/cindex-includes.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/bindings/python/examples/cindex/cindex-includes.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/bindings/python/examples/cindex/cindex-includes.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  #===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/tools/scan-view/bin/scan-view
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/tools/scan-view/bin/scan-view
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/tools/scan-view/share/startfile.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/tools/scan-view/share/startfile.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/tools/scan-view/share/startfile.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/tools/scan-view/share/startfile.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/tools/scan-view/share/startfile.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/tools/scan-view/share/startfile.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # -*- coding: utf-8 -*-
  
  """Utility for opening a file using the default application in a cross-platform
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/ABITest/ABITestGen.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/ABITest/ABITestGen.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/ABITest/ABITestGen.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/ABITest/ABITestGen.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/ABITest/ABITestGen.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/ABITest/ABITestGen.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  from pprint import pprint
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CIndex/completion_logger_server.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CIndex/completion_logger_server.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/CIndex/completion_logger_server.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CIndex/completion_logger_server.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/CIndex/completion_logger_server.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CIndex/completion_logger_server.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  from __future__ import absolute_import, division, print_function
  import sys
  from socket import *
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CaptureCmd
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CaptureCmd
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/CaptureCmd
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CaptureCmd
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/CaptureCmd
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CaptureCmd
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """CaptureCmd - A generic tool for capturing information about the
  invocations of another program.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CmpDriver
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CmpDriver
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/CmpDriver
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CmpDriver
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/CmpDriver
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CmpDriver
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  A simple utility that compares tool invocations and exit codes issued by
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/FindSpecRefs
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/FindSpecRefs
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/FindSpecRefs
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/FindSpecRefs
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/FindSpecRefs
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/FindSpecRefs
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import re
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/FuzzTest
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/FuzzTest
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/FuzzTest
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/FuzzTest
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/FuzzTest
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/FuzzTest
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  This is a generic fuzz testing tool, see --help for more information.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/TestUtils/deep-stack.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/TestUtils/deep-stack.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/TestUtils/deep-stack.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/TestUtils/deep-stack.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/TestUtils/deep-stack.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/TestUtils/deep-stack.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  def pcall(f, N):
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/CmpRuns.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/CmpRuns.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/CmpRuns.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/CmpRuns.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/CmpRuns.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/CmpRuns.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  CmpRuns - A simple tool for comparing two static analyzer runs to determine
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestAdd.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestAdd.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/SATestAdd.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestAdd.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/SATestAdd.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestAdd.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Static Analyzer qualification infrastructure: adding a new project to
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestBuild.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestBuild.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/SATestBuild.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestBuild.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/SATestBuild.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestBuild.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Static Analyzer qualification infrastructure.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestUpdateDiffs.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestUpdateDiffs.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/SATestUpdateDiffs.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestUpdateDiffs.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/SATestUpdateDiffs.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestUpdateDiffs.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Update reference results for static analyzer.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SumTimerInfo.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SumTimerInfo.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/SumTimerInfo.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SumTimerInfo.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/SumTimerInfo.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SumTimerInfo.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Script to Summarize statistics in the scan-build output.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/exploded-graph-rewriter.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/exploded-graph-rewriter.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/exploded-graph-rewriter.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/exploded-graph-rewriter.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/exploded-graph-rewriter.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/exploded-graph-rewriter.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  #===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--#
  #
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/check_cfc.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/check_cfc.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/check_cfc/check_cfc.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/check_cfc.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/check_cfc/check_cfc.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/check_cfc.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Check CFC - Check Compile Flow Consistency
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/obj_diff.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/obj_diff.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/check_cfc/obj_diff.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/obj_diff.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/check_cfc/obj_diff.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/obj_diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/test_check_cfc.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/test_check_cfc.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/check_cfc/test_check_cfc.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/test_check_cfc.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/check_cfc/test_check_cfc.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/test_check_cfc.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Test internal functions within check_cfc.py."""
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/modfuzz.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/modfuzz.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/modfuzz.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/modfuzz.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/modfuzz.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/modfuzz.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # To use:
  #  1) Update the 'decls' list below with your fuzzing configuration.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/token-delta.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/token-delta.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/token-delta.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/token-delta.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/token-delta.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/token-delta.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  import os
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/asan/scripts/asan_symbolize.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/asan/scripts/asan_symbolize.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/asan/scripts/asan_symbolize.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/asan/scripts/asan_symbolize.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===- lib/asan/scripts/asan_symbolize.py -----------------------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/dfsan/scripts/build-libc-list.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/dfsan/scripts/build-libc-list.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/dfsan/scripts/build-libc-list.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #===- lib/dfsan/scripts/build-libc-list.py ---------------------------------===#
- #
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
-===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===- lib/fuzzer/scripts/unbalanced_allocs.py ------------------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===- lib/sanitizer_common/scripts/gen_dynamic_list.py ---------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/sanitizer_common/scripts/sancov.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/sanitizer_common/scripts/sancov.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/sanitizer_common/scripts/sancov.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/sanitizer_common/scripts/sancov.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # Merge or print the coverage data collected by asan's coverage.
  # Input files are sequences of 4-byte integers.
  # We need to merge these integers into a set and then
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/cat_files.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/cat_files.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/libcxx/utils/cat_files.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/cat_files.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/libcxx/utils/cat_files.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/cat_files.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===----------------------------------------------------------------------===##
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/generate_feature_test_macro_components.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/generate_feature_test_macro_components.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/libcxx/utils/generate_feature_test_macro_components.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/generate_feature_test_macro_components.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/libcxx/utils/generate_feature_test_macro_components.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/generate_feature_test_macro_components.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  from builtins import range
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/sym_diff.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/sym_diff.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/libcxx/utils/sym_diff.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/sym_diff.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/libcxx/utils/sym_diff.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/sym_diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===----------------------------------------------------------------------===##
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lld/utils/benchmark.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lld/utils/benchmark.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lld/utils/benchmark.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lld/utils/benchmark.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lld/utils/benchmark.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lld/utils/benchmark.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  # See https://llvm.org/LICENSE.txt for license information.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/examples/python/file_extract.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/examples/python/file_extract.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/examples/python/file_extract.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/examples/python/file_extract.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/examples/python/file_extract.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/examples/python/file_extract.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import string
  import struct
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/packages/Python/lldbsuite/test/bench.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/packages/Python/lldbsuite/test/bench.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/packages/Python/lldbsuite/test/bench.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/packages/Python/lldbsuite/test/bench.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/packages/Python/lldbsuite/test/bench.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/packages/Python/lldbsuite/test/bench.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  A simple bench runner which delegates to the ./dotest.py test driver to run the
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import binascii
  import json
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/scripts/analyze-project-deps.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/scripts/analyze-project-deps.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/scripts/analyze-project-deps.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/scripts/analyze-project-deps.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/scripts/analyze-project-deps.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/scripts/analyze-project-deps.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import argparse
  import itertools
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/scripts/verify_api.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/scripts/verify_api.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/scripts/verify_api.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/scripts/verify_api.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/scripts/verify_api.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/scripts/verify_api.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import subprocess
  import optparse
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  '''This module implements a Finite State Machine (FSM). In addition to state
  this FSM also maintains a user defined "memory". So this FSM can be used as a
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/utils/lui/lui.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/utils/lui/lui.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/utils/lui/lui.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/utils/lui/lui.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/utils/lui/lui.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/utils/lui/lui.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  ##===-- lui.py -----------------------------------------------*- Python -*-===##
  ##
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/utils/lui/sandbox.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/utils/lui/sandbox.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/utils/lui/sandbox.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/utils/lui/sandbox.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/utils/lui/sandbox.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/utils/lui/sandbox.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  ##===-- sandbox.py -------------------------------------------*- Python -*-===##
  ##
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/BugPoint/compile-custom.ll.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/BugPoint/compile-custom.ll.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/test/BugPoint/compile-custom.ll.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/BugPoint/compile-custom.ll.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/test/BugPoint/compile-custom.ll.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/BugPoint/compile-custom.ll.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/Other/opt-bisect-helper.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/Other/opt-bisect-helper.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/test/Other/opt-bisect-helper.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/Other/opt-bisect-helper.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/test/Other/opt-bisect-helper.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/Other/opt-bisect-helper.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/TableGen/JSON-check.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/TableGen/JSON-check.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/test/TableGen/JSON-check.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/TableGen/JSON-check.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/test/TableGen/JSON-check.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/TableGen/JSON-check.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  import subprocess
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-diff.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/tools/opt-viewer/opt-diff.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-diff.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/tools/opt-viewer/opt-diff.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-stats.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-stats.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/tools/opt-viewer/opt-stats.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-stats.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/tools/opt-viewer/opt-stats.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-stats.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-viewer.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-viewer.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/tools/opt-viewer/opt-viewer.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-viewer.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/tools/opt-viewer/opt-viewer.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-viewer.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/optrecord.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/optrecord.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/tools/opt-viewer/optrecord.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/optrecord.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/tools/opt-viewer/optrecord.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/optrecord.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/Misc/zkill
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/Misc/zkill
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/Misc/zkill
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/Misc/zkill
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/Misc/zkill
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/Misc/zkill
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import re
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/abtest.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/abtest.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/abtest.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/abtest.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/abtest.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/abtest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # Given a previous good compile narrow down miscompiles.
  # Expects two directories named "before" and "after" each containing a set of
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bisect
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bisect
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/bisect
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bisect
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/bisect
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bisect
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # The way you use this is you create a script that takes in as its first
  # argument a count. The script passes into LLVM the count via a command
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bisect-skip-count
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bisect-skip-count
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/bisect-skip-count
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bisect-skip-count
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/bisect-skip-count
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bisect-skip-count
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # This script is used to bisect skip and count arguments for --debug-counter.
  # It is similar to bisect, except it understands how to increase skip and decrease count
  #
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bugpoint_gisel_reducer.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bugpoint_gisel_reducer.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/bugpoint_gisel_reducer.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bugpoint_gisel_reducer.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/bugpoint_gisel_reducer.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bugpoint_gisel_reducer.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Reduces GlobalISel failures.
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/clang-parse-diagnostics-file
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/clang-parse-diagnostics-file
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/clang-parse-diagnostics-file
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/clang-parse-diagnostics-file
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/clang-parse-diagnostics-file
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/clang-parse-diagnostics-file
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import plistlib
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/create_ladder_graph.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/create_ladder_graph.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/create_ladder_graph.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/create_ladder_graph.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/create_ladder_graph.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/create_ladder_graph.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """A ladder graph creation program.
  
  This is a python program that creates c source code that will generate
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/extract_symbols.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/extract_symbols.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/extract_symbols.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/extract_symbols.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/extract_symbols.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/extract_symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A tool for extracting a list of symbols to export
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/extract_vplan.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/extract_vplan.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/extract_vplan.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/extract_vplan.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/extract_vplan.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/extract_vplan.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # This script extracts the VPlan digraphs from the vectoriser debug messages
  # and saves them in individual dot files (one for each plan). Optionally, and
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/indirect_calls.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/indirect_calls.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/indirect_calls.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/indirect_calls.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/indirect_calls.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/indirect_calls.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A tool for looking for indirect jumps and calls in x86 binaries.
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/lit/ProgressBar.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/lit/ProgressBar.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/lit/ProgressBar.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/lit/ProgressBar.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/lit/ProgressBar.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/lit/ProgressBar.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # Source: http://code.activestate.com/recipes/475116/, with
  # modifications by Daniel Dunbar.
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import sys
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import sys
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  import os
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import argparse
  import platform
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/llvm-gisel-cov.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/llvm-gisel-cov.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/llvm-gisel-cov.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/llvm-gisel-cov.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/llvm-gisel-cov.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/llvm-gisel-cov.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """
  Summarize the information in the given coverage files.
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/prepare-code-coverage-artifact.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/prepare-code-coverage-artifact.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/prepare-code-coverage-artifact.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/prepare-code-coverage-artifact.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/prepare-code-coverage-artifact.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/prepare-code-coverage-artifact.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/release/findRegressions-nightly.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/release/findRegressions-nightly.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/release/findRegressions-nightly.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/release/findRegressions-nightly.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/release/findRegressions-nightly.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/release/findRegressions-nightly.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  from __future__ import print_function
  
  import re, string, sys, os, time
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/release/findRegressions-simple.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/release/findRegressions-simple.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/release/findRegressions-simple.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/release/findRegressions-simple.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/release/findRegressions-simple.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/release/findRegressions-simple.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  import re, string, sys, os, time, math
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/shuffle_fuzz.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/shuffle_fuzz.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/shuffle_fuzz.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/shuffle_fuzz.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/shuffle_fuzz.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/shuffle_fuzz.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A shuffle vector fuzz tester.
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/shuffle_select_fuzz_tester.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/shuffle_select_fuzz_tester.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/shuffle_select_fuzz_tester.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/shuffle_select_fuzz_tester.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/shuffle_select_fuzz_tester.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/shuffle_select_fuzz_tester.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A shuffle-select vector fuzz tester.
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/sort_includes.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/sort_includes.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/sort_includes.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/sort_includes.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/sort_includes.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/sort_includes.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Script to sort the top-most block of #include lines.
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/unicode-case-fold.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/unicode-case-fold.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/unicode-case-fold.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/unicode-case-fold.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/unicode-case-fold.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/unicode-case-fold.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """
  Unicode case folding database conversion utility
  
-Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/wciia.py
+Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/wciia.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/wciia.py
-+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/wciia.py
+--- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/wciia.py
++++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/wciia.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3

From 14540c15e05c46df5d79c86a0ca98632a961c79f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 17 Feb 2023 13:07:32 +0100
Subject: [PATCH 016/349] rebase of the patch

---
 debian/patches/libcxx/libcxx-armhf-ftbfs.diff | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff
index fde8436a..6cfadcf6 100644
--- a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff
+++ b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/include/atomic
+Index: llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec/libcxx/include/__atomic/aliases.h
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec.orig/libcxx/include/__atomic/aliases.h
++++ llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec/libcxx/include/__atomic/aliases.h
+@@ -106,9 +106,13 @@ typedef __conditional_t<_LIBCPP_CONTENTI
  #endif
  
  #if !defined(_LIBCPP_NO_LOCK_FREE_TYPES)
@@ -14,5 +14,5 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/include/a
 +
 +#undef NO_LOCK_FREE
  
- #define ATOMIC_FLAG_INIT {false}
- #define ATOMIC_VAR_INIT(__v) {__v}
+ _LIBCPP_END_NAMESPACE_STD
+ 

From f5433cbb4d6b2cb57aa5dfd99f3c589fd192f3ea Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 22 Feb 2023 17:15:27 +0100
Subject: [PATCH 017/349] rebase of the patch

---
 debian/patches/libcxx/libcxx-armhf-ftbfs.diff | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff
index 6cfadcf6..46d63e30 100644
--- a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff
+++ b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff
@@ -1,17 +1,16 @@
-Index: llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec/libcxx/include/__atomic/aliases.h
+Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec.orig/libcxx/include/__atomic/aliases.h
-+++ llvm-toolchain-snapshot_17~++20230217125913+76c638d1ddec/libcxx/include/__atomic/aliases.h
-@@ -106,9 +106,13 @@ typedef __conditional_t<_LIBCPP_CONTENTI
+--- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxx/include/__atomic/aliases.h
++++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h
+@@ -107,9 +107,12 @@ using __libcpp_unsigned_lock_free = __co
  #endif
  
  #if !defined(_LIBCPP_NO_LOCK_FREE_TYPES)
 +#ifndef NO_LOCK_FREE
- typedef atomic<__libcpp_signed_lock_free> atomic_signed_lock_free;
- typedef atomic<__libcpp_unsigned_lock_free> atomic_unsigned_lock_free;
+ using atomic_signed_lock_free   = atomic<__libcpp_signed_lock_free>;
+ using atomic_unsigned_lock_free = atomic<__libcpp_unsigned_lock_free>;
  #endif
 +#endif
-+
 +#undef NO_LOCK_FREE
  
  _LIBCPP_END_NAMESPACE_STD

From 16ee64a21c1ee455d0f683d96903996b87677a92 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 23 Feb 2023 23:31:26 +0100
Subject: [PATCH 018/349] rebase of the patch

---
 debian/patches/protobuf_3.21.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/protobuf_3.21.patch b/debian/patches/protobuf_3.21.patch
index 6ffe27a0..cdbf273d 100644
--- a/debian/patches/protobuf_3.21.patch
+++ b/debian/patches/protobuf_3.21.patch
@@ -1,15 +1,15 @@
-Index: llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+Index: llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221126040739+502c246519ec.orig/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
-+++ llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
-@@ -67,8 +67,8 @@ int main(int argc, char *argv[]) {
-       google::protobuf::util::MessageToJsonString(Response, &Output, Options);
+--- llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c.orig/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
++++ llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp
+@@ -68,8 +68,9 @@ int main(int argc, char *argv[]) {
    if (!JsonStatus.ok()) {
      clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n",
--                        Response.DebugString(), JsonStatus.error_code(),
--                        JsonStatus.error_message().as_string());
-+                        Response.DebugString(), (int)JsonStatus.code(),
-+                        JsonStatus.message().as_string());
+                         Response.DebugString(),
+-                        static_cast<int>(JsonStatus.code()),
++                        (int)JsonStatus.code(),
+                         JsonStatus.message().as_string());
++
      return -1;
    }
    llvm::outs() << Output;

From 125f64f45d160b6c53138192a4e9a3f8fd255ecf Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 3 Mar 2023 10:22:10 +0100
Subject: [PATCH 019/349] rebase of the patch

---
 debian/patches/clang-format-version.diff | 28 ++++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff
index a4c98fdb..4e05787c 100644
--- a/debian/patches/clang-format-version.diff
+++ b/debian/patches/clang-format-version.diff
@@ -4,23 +4,23 @@
  clang/tools/clang-format/clang-format.py      |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format-diff.py
+Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487.orig/clang/tools/clang-format/clang-format-diff.py
-+++ llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format-diff.py
-@@ -63,7 +63,7 @@ def main():
+--- llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f.orig/clang/tools/clang-format/clang-format-diff.py
++++ llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format-diff.py
+@@ -78,7 +78,7 @@ def main():
                        'fallback in case clang-format is invoked with'
                        '-style=file, but can not find the .clang-format'
                        'file to use.')
 -  parser.add_argument('-binary', default='clang-format',
 +  parser.add_argument('-binary', default='clang-format-17',
                        help='location of binary to use for clang-format')
-   args = parser.parse_args()
- 
-Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.el
+   parser.add_argument('-j', default=1, type=int, metavar='N',
+                       help='number of concurrent clang-format processes to spawn in '
+Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.el
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487.orig/clang/tools/clang-format/clang-format.el
-+++ llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.el
+--- llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f.orig/clang/tools/clang-format/clang-format.el
++++ llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.el
 @@ -37,7 +37,7 @@
    :group 'tools)
  
@@ -30,16 +30,16 @@ Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clan
        "clang-format")
    "Location of the clang-format executable.
  
-Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.py
+Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487.orig/clang/tools/clang-format/clang-format.py
-+++ llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.py
-@@ -48,7 +48,7 @@ import vim
+--- llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f.orig/clang/tools/clang-format/clang-format.py
++++ llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.py
+@@ -49,7 +49,7 @@ import vim
  
  # set g:clang_format_path to the path to clang-format if it is not on the path
  # Change this to the full path if clang-format is not on the path.
 -binary = 'clang-format'
-+binary = 'clang-format-16'
++binary = 'clang-format-17'
  if vim.eval('exists("g:clang_format_path")') == "1":
    binary = vim.eval('g:clang_format_path')
  

From b1e20c679d36879835d71820779614c8476d3819 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 8 Mar 2023 19:00:13 +0100
Subject: [PATCH 020/349] rebase of the patch

---
 debian/patches/force-sse2-compiler-rt.diff | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff
index 7a5a49c2..0e0c617e 100644
--- a/debian/patches/force-sse2-compiler-rt.diff
+++ b/debian/patches/force-sse2-compiler-rt.diff
@@ -1,10 +1,10 @@
-Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/compiler-rt/lib/builtins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230308065614+73516b355c62/compiler-rt/lib/builtins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/compiler-rt/lib/builtins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/compiler-rt/lib/builtins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230308065614+73516b355c62.orig/compiler-rt/lib/builtins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230308065614+73516b355c62/compiler-rt/lib/builtins/CMakeLists.txt
 @@ -754,6 +754,12 @@ else ()
- 
-   append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS)
+     append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
+   endif()
  
 +  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
 +    append_list_if(COMPILER_RT_HAS_FLOAT16 -msse2 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS)

From a2a7b4f60dccf2074e46929c795d83e8166c8915 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 9 Mar 2023 12:54:30 +0100
Subject: [PATCH 021/349] rebase of the patch

---
 debian/patches/clang-format-version.diff | 24 ++++++++++----------
 debian/patches/hurd/hurd-pathmax.diff    | 28 +++++-------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff
index 4e05787c..5ea4a162 100644
--- a/debian/patches/clang-format-version.diff
+++ b/debian/patches/clang-format-version.diff
@@ -4,23 +4,23 @@
  clang/tools/clang-format/clang-format.py      |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format-diff.py
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f.orig/clang/tools/clang-format/clang-format-diff.py
-+++ llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format-diff.py
-@@ -78,7 +78,7 @@ def main():
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/tools/clang-format/clang-format-diff.py
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format-diff.py
+@@ -63,7 +63,7 @@ def main():
                        'fallback in case clang-format is invoked with'
                        '-style=file, but can not find the .clang-format'
                        'file to use.')
 -  parser.add_argument('-binary', default='clang-format',
 +  parser.add_argument('-binary', default='clang-format-17',
                        help='location of binary to use for clang-format')
-   parser.add_argument('-j', default=1, type=int, metavar='N',
-                       help='number of concurrent clang-format processes to spawn in '
-Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.el
+   args = parser.parse_args()
+ 
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.el
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f.orig/clang/tools/clang-format/clang-format.el
-+++ llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.el
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/tools/clang-format/clang-format.el
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.el
 @@ -37,7 +37,7 @@
    :group 'tools)
  
@@ -30,10 +30,10 @@ Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clan
        "clang-format")
    "Location of the clang-format executable.
  
-Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.py
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f.orig/clang/tools/clang-format/clang-format.py
-+++ llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.py
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/tools/clang-format/clang-format.py
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.py
 @@ -49,7 +49,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/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff
index 421aebd8..c8939dd8 100644
--- a/debian/patches/hurd/hurd-pathmax.diff
+++ b/debian/patches/hurd/hurd-pathmax.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/FileManager.cpp
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/lib/Basic/FileManager.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Basic/FileManager.cpp
-+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/FileManager.cpp
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/lib/Basic/FileManager.cpp
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/lib/Basic/FileManager.cpp
 @@ -610,6 +610,12 @@ FileManager::getNoncachedStatValue(Strin
    return std::error_code();
  }
@@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/
  void FileManager::GetUniqueIDMapping(
      SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
    UIDToFiles.clear();
-Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lldb/lldb-defines.h
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/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
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/lldb/include/lldb/lldb-defines.h
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/lldb/include/lldb/lldb-defines.h
 @@ -15,6 +15,11 @@
  #define INT32_MAX 2147483647
  #endif
@@ -31,19 +31,3 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lld
  #if !defined(UINT32_MAX)
  #define UINT32_MAX 4294967295U
  #endif
-Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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"
- 
-+// For GNU Hurd
-+#if defined(__GNU__) && !defined(PATH_MAX)
-+# define PATH_MAX 4096
-+#endif
-+
- /* Open the host .cu file and the kernel .hu and .cu files for writing.
-  * Add the necessary includes.
-  */

From 13461f1516fcd31cc69ce4b7f69753364db76326 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 15 Mar 2023 21:39:17 +0100
Subject: [PATCH 022/349] _You_must_link_with_Intel_OpenMP_library has been
 removed

---
 debian/libomp5-X.Y.symbols.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in
index 45b46043..5068ae8a 100644
--- a/debian/libomp5-X.Y.symbols.in
+++ b/debian/libomp5-X.Y.symbols.in
@@ -270,8 +270,6 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  OMP_4.5@OMP_4.5 7
  OMP_5.0@OMP_5.0 13
  VERSION@VERSION 0.20130412
- _You_must_link_with_Intel_OpenMP_library@VERSION 0.20130412
- _You_must_link_with_exactly_one_OpenMP_library@VERSION 0.20130412
  ___kmp_allocate@VERSION 0.20130412
  ___kmp_free@VERSION 0.20130412
  __kmp_acquire_drdpa_lock@VERSION 0.20130715

From d93b352e66225b9172b3655fb30194b62b9b4aa6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 15 Mar 2023 21:41:45 +0100
Subject: [PATCH 023/349] refresh the list of libomp symbols

---
 debian/libomp5-X.Y.symbols.in | 272 ++++++++++++++++++++++++++++++++++
 1 file changed, 272 insertions(+)

diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in
index 5068ae8a..b0e08c89 100644
--- a/debian/libomp5-X.Y.symbols.in
+++ b/debian/libomp5-X.Y.symbols.in
@@ -280,13 +280,17 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmp_acquire_queuing_lock@VERSION 0.20130715
  __kmp_acquire_tas_lock@VERSION 0.20130715
  __kmp_acquire_ticket_lock@VERSION 0.20130715
+ __kmp_debugging@VERSION 17
  __kmp_fork_call@VERSION 0.20130715
  __kmp_get_reduce_method@VERSION 0.20130412
  __kmp_invoke_microtask@VERSION 0.20130715
  __kmp_itt_fini_ittlib@VERSION 0.20130715
  __kmp_itt_init_ittlib@VERSION 0.20130715
+ __kmp_omp_debug_struct_info@VERSION 17
+ __kmp_reap_monitor@VERSION 17
  __kmp_reap_worker@VERSION 0.20130715
  __kmp_release_64@VERSION 0.20140926
+ __kmp_reset_stats@VERSION 17
  __kmp_thread_pool@VERSION 0.20130412
  __kmp_wait_4@VERSION 9
  __kmp_wait_64@VERSION 0.20140926
@@ -809,6 +813,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_cancel_barrier@VERSION 0.20131209
  __kmpc_cancellationpoint@VERSION 0.20131209
  __kmpc_copyprivate@VERSION 0.20130412
+ __kmpc_copyprivate_light@VERSION 17
  __kmpc_critical@VERSION 0.20130412
  __kmpc_critical_with_hint@VERSION 3.8.0
  __kmpc_destroy_allocator@VERSION 9
@@ -847,6 +852,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_end_reduce@VERSION 0.20130412
  __kmpc_end_reduce_nowait@VERSION 0.20130412
  __kmpc_end_scope@VERSION 14
+ __kmpc_end_sections@VERSION 17
  __kmpc_end_serialized_parallel@VERSION 0.20130412
  __kmpc_end_single@VERSION 0.20130412
  __kmpc_end_taskgroup@VERSION 0.20130412
@@ -858,6 +864,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_for_static_init_8@VERSION 0.20130412
  __kmpc_for_static_init_8u@VERSION 0.20130412
  __kmpc_fork_call@VERSION 0.20130412
+ __kmpc_fork_call_if@VERSION 17
  __kmpc_fork_teams@VERSION 0.20130715
  __kmpc_free@VERSION 8
  __kmpc_get_default_allocator@VERSION 8
@@ -875,7 +882,10 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_invoke_task_func@VERSION 0.20130412
  __kmpc_masked@VERSION 13
  __kmpc_master@VERSION 0.20130412
+ __kmpc_next_section@VERSION 17
  __kmpc_ok_to_fork@VERSION 0.20130412
+ __kmpc_omp_get_target_async_handle_ptr@VERSION 17
+ __kmpc_omp_has_task_team@VERSION 17
  __kmpc_omp_reg_task_with_affinity@VERSION 8
  __kmpc_omp_target_task_alloc@VERSION 9
  __kmpc_omp_task@VERSION 0.20130412
@@ -885,6 +895,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_omp_task_parts@VERSION 0.20130412
  __kmpc_omp_task_with_deps@VERSION 0.20130912
  __kmpc_omp_taskwait@VERSION 0.20130412
+ __kmpc_omp_taskwait_deps_51@VERSION 17
  __kmpc_omp_taskyield@VERSION 0.20130412
  __kmpc_omp_wait_deps@VERSION 0.20130912
  __kmpc_ordered@VERSION 0.20130412
@@ -900,6 +911,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_reduce@VERSION 0.20130412
  __kmpc_reduce_nowait@VERSION 0.20130412
  __kmpc_scope@VERSION 14
+ __kmpc_sections_init@VERSION 17
  __kmpc_serialized_parallel@VERSION 0.20130412
  __kmpc_set_default_allocator@VERSION 8
  __kmpc_set_lock@VERSION 0.20130412
@@ -1084,6 +1096,18 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  omp_get_initial_device@VERSION 8
  omp_get_initial_device_@OMP_4.5 13
  omp_get_initial_device_@VERSION 8
+ omp_get_interop_int@VERSION 17
+ omp_get_interop_int_@VERSION 17
+ omp_get_interop_name@VERSION 17
+ omp_get_interop_name_@VERSION 17
+ omp_get_interop_ptr@VERSION 17
+ omp_get_interop_ptr_@VERSION 17
+ omp_get_interop_rc_desc@VERSION 17
+ omp_get_interop_rc_desc_@VERSION 17
+ omp_get_interop_str@VERSION 17
+ omp_get_interop_str_@VERSION 17
+ omp_get_interop_type_desc@VERSION 17
+ omp_get_interop_type_desc_@VERSION 17
  omp_get_level@OMP_3.0 0.20131209
  omp_get_level@VERSION 0.20130412
  omp_get_level_@OMP_3.0 0.20131209
@@ -1110,6 +1134,8 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  omp_get_num_devices@VERSION 8
  omp_get_num_devices_@OMP_4.0 8
  omp_get_num_devices_@VERSION 8
+ omp_get_num_interop_properties@VERSION 17
+ omp_get_num_interop_properties_@VERSION 17
  omp_get_num_places@OMP_4.5 7
  omp_get_num_places@VERSION 3.9.0
  omp_get_num_places_@OMP_4.5 7
@@ -1184,6 +1210,8 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  omp_get_wtime_@VERSION 0.20130412
  omp_high_bw_mem_alloc@VERSION 8
  omp_high_bw_mem_space@VERSION 9
+ omp_in_explicit_task@VERSION 17
+ omp_in_explicit_task_@VERSION 17
  omp_in_final@OMP_3.1 0.20131209
  omp_in_final@VERSION 0.20130412
  omp_in_final_@OMP_3.1 0.20131209
@@ -1312,4 +1340,248 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  ompc_set_nested@VERSION 0.20130412
  ompc_set_num_threads@VERSION 0.20130412
  ompc_set_schedule@VERSION 0.20130412
+ ompt_libomp_connect@VERSION 17
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)ompt_start_tool@VERSION 6.0
+libomptarget.rtl.amdgpu.nextgen.so.17 libomp5-17 #MINVER#
+ VERS1.0@VERS1.0 17
+ __tgt_rtl_create_event@VERS1.0 17
+ __tgt_rtl_data_alloc@VERS1.0 17
+ __tgt_rtl_data_delete@VERS1.0 17
+ __tgt_rtl_data_exchange@VERS1.0 17
+ __tgt_rtl_data_exchange_async@VERS1.0 17
+ __tgt_rtl_data_lock@VERS1.0 17
+ __tgt_rtl_data_notify_mapped@VERS1.0 17
+ __tgt_rtl_data_notify_unmapped@VERS1.0 17
+ __tgt_rtl_data_retrieve@VERS1.0 17
+ __tgt_rtl_data_retrieve_async@VERS1.0 17
+ __tgt_rtl_data_submit@VERS1.0 17
+ __tgt_rtl_data_submit_async@VERS1.0 17
+ __tgt_rtl_data_unlock@VERS1.0 17
+ __tgt_rtl_deinit_device@VERS1.0 17
+ __tgt_rtl_deinit_plugin@VERS1.0 17
+ __tgt_rtl_destroy_event@VERS1.0 17
+ __tgt_rtl_init_async_info@VERS1.0 17
+ __tgt_rtl_init_device@VERS1.0 17
+ __tgt_rtl_init_device_info@VERS1.0 17
+ __tgt_rtl_init_plugin@VERS1.0 17
+ __tgt_rtl_init_requires@VERS1.0 17
+ __tgt_rtl_is_data_exchangable@VERS1.0 17
+ __tgt_rtl_is_valid_binary@VERS1.0 17
+ __tgt_rtl_is_valid_binary_info@VERS1.0 17
+ __tgt_rtl_launch_kernel@VERS1.0 17
+ __tgt_rtl_load_binary@VERS1.0 17
+ __tgt_rtl_number_of_devices@VERS1.0 17
+ __tgt_rtl_print_device_info@VERS1.0 17
+ __tgt_rtl_query_async@VERS1.0 17
+ __tgt_rtl_record_event@VERS1.0 17
+ __tgt_rtl_set_info_flag@VERS1.0 17
+ __tgt_rtl_supports_empty_images@VERS1.0 17
+ __tgt_rtl_sync_event@VERS1.0 17
+ __tgt_rtl_synchronize@VERS1.0 17
+ __tgt_rtl_wait_event@VERS1.0 17
+libomptarget.rtl.amdgpu.so.17 libomp5-17 #MINVER#
+ VERS1.0@VERS1.0 17
+ __tgt_rtl_data_alloc@VERS1.0 17
+ __tgt_rtl_data_delete@VERS1.0 17
+ __tgt_rtl_data_lock@VERS1.0 17
+ __tgt_rtl_data_retrieve@VERS1.0 17
+ __tgt_rtl_data_retrieve_async@VERS1.0 17
+ __tgt_rtl_data_submit@VERS1.0 17
+ __tgt_rtl_data_submit_async@VERS1.0 17
+ __tgt_rtl_data_unlock@VERS1.0 17
+ __tgt_rtl_deinit_plugin@VERS1.0 17
+ __tgt_rtl_init_device@VERS1.0 17
+ __tgt_rtl_init_plugin@VERS1.0 17
+ __tgt_rtl_init_requires@VERS1.0 17
+ __tgt_rtl_is_valid_binary@VERS1.0 17
+ __tgt_rtl_is_valid_binary_info@VERS1.0 17
+ __tgt_rtl_launch_kernel@VERS1.0 17
+ __tgt_rtl_load_binary@VERS1.0 17
+ __tgt_rtl_number_of_devices@VERS1.0 17
+ __tgt_rtl_print_device_info@VERS1.0 17
+ __tgt_rtl_synchronize@VERS1.0 17
+libomptarget.rtl.cuda.nextgen.so.17 libomp5-17 #MINVER#
+ VERS1.0@VERS1.0 17
+ __tgt_rtl_create_event@VERS1.0 17
+ __tgt_rtl_data_alloc@VERS1.0 17
+ __tgt_rtl_data_delete@VERS1.0 17
+ __tgt_rtl_data_exchange@VERS1.0 17
+ __tgt_rtl_data_exchange_async@VERS1.0 17
+ __tgt_rtl_data_lock@VERS1.0 17
+ __tgt_rtl_data_notify_mapped@VERS1.0 17
+ __tgt_rtl_data_notify_unmapped@VERS1.0 17
+ __tgt_rtl_data_retrieve@VERS1.0 17
+ __tgt_rtl_data_retrieve_async@VERS1.0 17
+ __tgt_rtl_data_submit@VERS1.0 17
+ __tgt_rtl_data_submit_async@VERS1.0 17
+ __tgt_rtl_data_unlock@VERS1.0 17
+ __tgt_rtl_deinit_device@VERS1.0 17
+ __tgt_rtl_deinit_plugin@VERS1.0 17
+ __tgt_rtl_destroy_event@VERS1.0 17
+ __tgt_rtl_init_async_info@VERS1.0 17
+ __tgt_rtl_init_device@VERS1.0 17
+ __tgt_rtl_init_device_info@VERS1.0 17
+ __tgt_rtl_init_plugin@VERS1.0 17
+ __tgt_rtl_init_requires@VERS1.0 17
+ __tgt_rtl_is_data_exchangable@VERS1.0 17
+ __tgt_rtl_is_valid_binary@VERS1.0 17
+ __tgt_rtl_is_valid_binary_info@VERS1.0 17
+ __tgt_rtl_launch_kernel@VERS1.0 17
+ __tgt_rtl_load_binary@VERS1.0 17
+ __tgt_rtl_number_of_devices@VERS1.0 17
+ __tgt_rtl_print_device_info@VERS1.0 17
+ __tgt_rtl_query_async@VERS1.0 17
+ __tgt_rtl_record_event@VERS1.0 17
+ __tgt_rtl_set_info_flag@VERS1.0 17
+ __tgt_rtl_supports_empty_images@VERS1.0 17
+ __tgt_rtl_sync_event@VERS1.0 17
+ __tgt_rtl_synchronize@VERS1.0 17
+ __tgt_rtl_wait_event@VERS1.0 17
+libomptarget.rtl.cuda.so.17 libomp5-17 #MINVER#
+ VERS1.0@VERS1.0 17
+ __tgt_rtl_create_event@VERS1.0 17
+ __tgt_rtl_data_alloc@VERS1.0 17
+ __tgt_rtl_data_delete@VERS1.0 17
+ __tgt_rtl_data_exchange@VERS1.0 17
+ __tgt_rtl_data_exchange_async@VERS1.0 17
+ __tgt_rtl_data_retrieve@VERS1.0 17
+ __tgt_rtl_data_retrieve_async@VERS1.0 17
+ __tgt_rtl_data_submit@VERS1.0 17
+ __tgt_rtl_data_submit_async@VERS1.0 17
+ __tgt_rtl_deinit_device@VERS1.0 17
+ __tgt_rtl_destroy_event@VERS1.0 17
+ __tgt_rtl_init_async_info@VERS1.0 17
+ __tgt_rtl_init_device@VERS1.0 17
+ __tgt_rtl_init_device_info@VERS1.0 17
+ __tgt_rtl_init_requires@VERS1.0 17
+ __tgt_rtl_is_data_exchangable@VERS1.0 17
+ __tgt_rtl_is_valid_binary@VERS1.0 17
+ __tgt_rtl_is_valid_binary_info@VERS1.0 17
+ __tgt_rtl_launch_kernel@VERS1.0 17
+ __tgt_rtl_load_binary@VERS1.0 17
+ __tgt_rtl_number_of_devices@VERS1.0 17
+ __tgt_rtl_print_device_info@VERS1.0 17
+ __tgt_rtl_query_async@VERS1.0 17
+ __tgt_rtl_record_event@VERS1.0 17
+ __tgt_rtl_release_async_info@VERS1.0 17
+ __tgt_rtl_run_target_region@VERS1.0 17
+ __tgt_rtl_run_target_region_async@VERS1.0 17
+ __tgt_rtl_run_target_team_region@VERS1.0 17
+ __tgt_rtl_run_target_team_region_async@VERS1.0 17
+ __tgt_rtl_set_info_flag@VERS1.0 17
+ __tgt_rtl_sync_event@VERS1.0 17
+ __tgt_rtl_synchronize@VERS1.0 17
+ __tgt_rtl_wait_event@VERS1.0 17
+libomptarget.rtl.x86_64.nextgen.so.17 libomp5-17 #MINVER#
+ VERS1.0@VERS1.0 17
+ __tgt_rtl_create_event@VERS1.0 17
+ __tgt_rtl_data_alloc@VERS1.0 17
+ __tgt_rtl_data_delete@VERS1.0 17
+ __tgt_rtl_data_exchange@VERS1.0 17
+ __tgt_rtl_data_exchange_async@VERS1.0 17
+ __tgt_rtl_data_lock@VERS1.0 17
+ __tgt_rtl_data_notify_mapped@VERS1.0 17
+ __tgt_rtl_data_notify_unmapped@VERS1.0 17
+ __tgt_rtl_data_retrieve@VERS1.0 17
+ __tgt_rtl_data_retrieve_async@VERS1.0 17
+ __tgt_rtl_data_submit@VERS1.0 17
+ __tgt_rtl_data_submit_async@VERS1.0 17
+ __tgt_rtl_data_unlock@VERS1.0 17
+ __tgt_rtl_deinit_device@VERS1.0 17
+ __tgt_rtl_deinit_plugin@VERS1.0 17
+ __tgt_rtl_destroy_event@VERS1.0 17
+ __tgt_rtl_init_async_info@VERS1.0 17
+ __tgt_rtl_init_device@VERS1.0 17
+ __tgt_rtl_init_device_info@VERS1.0 17
+ __tgt_rtl_init_plugin@VERS1.0 17
+ __tgt_rtl_init_requires@VERS1.0 17
+ __tgt_rtl_is_data_exchangable@VERS1.0 17
+ __tgt_rtl_is_valid_binary@VERS1.0 17
+ __tgt_rtl_is_valid_binary_info@VERS1.0 17
+ __tgt_rtl_launch_kernel@VERS1.0 17
+ __tgt_rtl_load_binary@VERS1.0 17
+ __tgt_rtl_number_of_devices@VERS1.0 17
+ __tgt_rtl_print_device_info@VERS1.0 17
+ __tgt_rtl_query_async@VERS1.0 17
+ __tgt_rtl_record_event@VERS1.0 17
+ __tgt_rtl_set_info_flag@VERS1.0 17
+ __tgt_rtl_supports_empty_images@VERS1.0 17
+ __tgt_rtl_sync_event@VERS1.0 17
+ __tgt_rtl_synchronize@VERS1.0 17
+ __tgt_rtl_wait_event@VERS1.0 17
+libomptarget.rtl.x86_64.so.17 libomp5-17 #MINVER#
+ VERS1.0@VERS1.0 17
+ __tgt_rtl_data_alloc@VERS1.0 17
+ __tgt_rtl_data_delete@VERS1.0 17
+ __tgt_rtl_data_retrieve@VERS1.0 17
+ __tgt_rtl_data_submit@VERS1.0 17
+ __tgt_rtl_init_device@VERS1.0 17
+ __tgt_rtl_is_valid_binary@VERS1.0 17
+ __tgt_rtl_launch_kernel@VERS1.0 17
+ __tgt_rtl_load_binary@VERS1.0 17
+ __tgt_rtl_number_of_devices@VERS1.0 17
+ __tgt_rtl_print_device_info@VERS1.0 17
+libomptarget.so.17 libomp5-17 #MINVER#
+ VERS1.0@VERS1.0 17
+ __kmpc_push_target_tripcount@VERS1.0 17
+ __kmpc_push_target_tripcount_mapper@VERS1.0 17
+ __tgt_init_all_rtls@VERS1.0 17
+ __tgt_interop_destroy@VERS1.0 17
+ __tgt_interop_init@VERS1.0 17
+ __tgt_interop_use@VERS1.0 17
+ __tgt_mapper_num_components@VERS1.0 17
+ __tgt_print_device_info@VERS1.0 17
+ __tgt_push_mapper_component@VERS1.0 17
+ __tgt_register_lib@VERS1.0 17
+ __tgt_register_requires@VERS1.0 17
+ __tgt_set_info_flag@VERS1.0 17
+ __tgt_target@VERS1.0 17
+ __tgt_target_data_begin@VERS1.0 17
+ __tgt_target_data_begin_mapper@VERS1.0 17
+ __tgt_target_data_begin_nowait@VERS1.0 17
+ __tgt_target_data_begin_nowait_mapper@VERS1.0 17
+ __tgt_target_data_end@VERS1.0 17
+ __tgt_target_data_end_mapper@VERS1.0 17
+ __tgt_target_data_end_nowait@VERS1.0 17
+ __tgt_target_data_end_nowait_mapper@VERS1.0 17
+ __tgt_target_data_update@VERS1.0 17
+ __tgt_target_data_update_mapper@VERS1.0 17
+ __tgt_target_data_update_nowait@VERS1.0 17
+ __tgt_target_data_update_nowait_mapper@VERS1.0 17
+ __tgt_target_kernel@VERS1.0 17
+ __tgt_target_kernel_nowait@VERS1.0 17
+ __tgt_target_kernel_replay@VERS1.0 17
+ __tgt_target_mapper@VERS1.0 17
+ __tgt_target_nowait@VERS1.0 17
+ __tgt_target_nowait_mapper@VERS1.0 17
+ __tgt_target_nowait_query@VERS1.0 17
+ __tgt_target_teams@VERS1.0 17
+ __tgt_target_teams_mapper@VERS1.0 17
+ __tgt_target_teams_nowait@VERS1.0 17
+ __tgt_target_teams_nowait_mapper@VERS1.0 17
+ __tgt_unregister_lib@VERS1.0 17
+ llvm_omp_target_alloc_device@VERS1.0 17
+ llvm_omp_target_alloc_host@VERS1.0 17
+ llvm_omp_target_alloc_shared@VERS1.0 17
+ llvm_omp_target_dynamic_shared_alloc@VERS1.0 17
+ llvm_omp_target_free_device@VERS1.0 17
+ llvm_omp_target_free_host@VERS1.0 17
+ llvm_omp_target_free_shared@VERS1.0 17
+ llvm_omp_target_lock_mem@VERS1.0 17
+ llvm_omp_target_unlock_mem@VERS1.0 17
+ omp_get_device_num@VERS1.0 17
+ omp_get_initial_device@VERS1.0 17
+ omp_get_interop_int@VERS1.0 17
+ omp_get_interop_name@VERS1.0 17
+ omp_get_interop_ptr@VERS1.0 17
+ omp_get_interop_str@VERS1.0 17
+ omp_get_interop_type_desc@VERS1.0 17
+ omp_get_mapped_ptr@VERS1.0 17
+ omp_get_num_devices@VERS1.0 17
+ omp_target_alloc@VERS1.0 17
+ omp_target_associate_ptr@VERS1.0 17
+ omp_target_disassociate_ptr@VERS1.0 17
+ omp_target_free@VERS1.0 17
+ omp_target_is_present@VERS1.0 17
+ omp_target_memcpy@VERS1.0 17
+ omp_target_memcpy_rect@VERS1.0 17

From 56b5a12e1a22f2f34c041c3b41b1e24900a9e61b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 17 Mar 2023 18:10:30 +0100
Subject: [PATCH 024/349] fix merge

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index f6c7f30d..873b4153 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: llvm-toolchain-16
+Source: llvm-toolchain-snapshot
 Section: devel
 Priority: optional
 Rules-Requires-Root: no

From c2559407908da287b34ca1625272558a1b525071 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 17 Mar 2023 19:21:04 +0100
Subject: [PATCH 025/349] remove patch applied upstream

---
 debian/patches/amdgpu/bitcode-multiarch.patch | 53 -------------------
 debian/patches/amdgpu/nonlinux.patch          | 20 -------
 debian/patches/series                         |  3 --
 3 files changed, 76 deletions(-)
 delete mode 100644 debian/patches/amdgpu/bitcode-multiarch.patch
 delete mode 100644 debian/patches/amdgpu/nonlinux.patch

diff --git a/debian/patches/amdgpu/bitcode-multiarch.patch b/debian/patches/amdgpu/bitcode-multiarch.patch
deleted file mode 100644
index 88e2ef55..00000000
--- a/debian/patches/amdgpu/bitcode-multiarch.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From efa9394d72968e0c84c2c9283476c70807f60b80 Mon Sep 17 00:00:00 2001
-From: Cordell Bloor <cgmb@slerp.xyz>
-Date: Wed, 8 Mar 2023 02:57:51 -0700
-Subject: [PATCH] Search for the bitcode libraries in a multiarch directory
-
-The Debian path for the rocm-device-libs is
-/usr/lib/$(DEB_HOST_MULTIARCH)/amdgcn/bitcode
-
-Forwarded: not-needed
----
- clang/lib/Driver/ToolChains/AMDGPU.cpp | 19 +++++++++++++------
- 1 file changed, 13 insertions(+), 6 deletions(-)
-
-Index: llvm-toolchain-15-15.0.7/clang/lib/Driver/ToolChains/AMDGPU.cpp
-===================================================================
---- llvm-toolchain-15-15.0.7.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
-+++ llvm-toolchain-15-15.0.7/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -14,6 +14,7 @@
- #include "clang/Driver/DriverDiagnostic.h"
- #include "clang/Driver/InputInfo.h"
- #include "clang/Driver/Options.h"
-+#include "llvm/ADT/Triple.h"
- #include "llvm/Option/ArgList.h"
- #include "llvm/Support/Error.h"
- #include "llvm/Support/FileUtilities.h"
-@@ -423,16 +424,21 @@ void RocmInstallationDetector::detectDev
-     // The possible structures are:
-     // - ${ROCM_ROOT}/amdgcn/bitcode/*
-     // - ${ROCM_ROOT}/lib/*
-+    // - ${ROCM_ROOT}/lib/<multiarch>/amdgcn/bitcode/*
-     // - ${ROCM_ROOT}/lib/bitcode/*
--    // so try to detect these layouts.
--    static constexpr std::array<const char *, 2> SubDirsList[] = {
--        {"amdgcn", "bitcode"},
--        {"lib", ""},
--        {"lib", "bitcode"},
-+    // so try to detect these layouts. Note that bitcode is associated with the
-+    // compiler that built it (not the target architecture).
-+    llvm::Triple HostTriple(llvm::sys::getProcessTriple());
-+    std::string Multiarch = Twine(HostTriple.getArchName() + "-linux-gnu").str();
-+    static const std::array<std::string, 4> SubDirsList[] = {
-+        {"amdgcn", "bitcode", "", ""},
-+        {"lib", "", "", ""},
-+        {"lib", Multiarch, "amdgcn", "bitcode"},
-+        {"lib", "bitcode", "", ""},
-     };
- 
-     // Make a path by appending sub-directories to InstallPath.
--    auto MakePath = [&](const llvm::ArrayRef<const char *> &SubDirs) {
-+    auto MakePath = [&](const llvm::ArrayRef<std::string> &SubDirs) {
-       auto Path = CandidatePath;
-       for (auto SubDir : SubDirs)
-         llvm::sys::path::append(Path, SubDir);
diff --git a/debian/patches/amdgpu/nonlinux.patch b/debian/patches/amdgpu/nonlinux.patch
deleted file mode 100644
index 0f66f517..00000000
--- a/debian/patches/amdgpu/nonlinux.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://reviews.llvm.org/D143017
-
-[Libomptarget] Fix disabling amdgpu on non-Linux.
-
-Previously, on non-Linux, amdgpu would get enabled whatever the CPU
-architecture.
-
-Index: llvm-toolchain-16_16.0.0~+rc4/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
-===================================================================
---- llvm-toolchain-16_16.0.0~+rc4.orig/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
-+++ llvm-toolchain-16_16.0.0~+rc4/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
-@@ -22,7 +22,7 @@ endif()
- # as of rocm-3.7, hsa is installed with cmake packages and kmt is found via hsa
- find_package(hsa-runtime64 QUIET 1.2.0 HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm)
- 
--if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
-+if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux"))
-   libomptarget_say("Not building AMDGPU plugin: only support AMDGPU in Linux x86_64, ppc64le, or aarch64 hosts")
-   return()
- endif()
diff --git a/debian/patches/series b/debian/patches/series
index 5735066f..f2744617 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,6 +148,3 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-
-amdgpu/nonlinux.patch
-#amdgpu/bitcode-multiarch.patch

From 332b1b6b4d6c892021ce4a6f9d930aea55777f33 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 28 Mar 2023 08:05:35 +0200
Subject: [PATCH 026/349] rebase of the patches

---
 .../libcxx/libcxx-silent-failure-arm64.diff    | 18 +++++++++---------
 .../libcxx/libcxxabi-fix-link-builtins.diff    |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff
index bfa5f565..5a596877 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_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+Index: llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
-+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+--- llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
++++ llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
 @@ -8,6 +8,7 @@
  //
  // UNSUPPORTED: no-threads
@@ -10,15 +10,15 @@ Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/
  
  // <condition_variable>
  
-Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+Index: llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
-+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
-@@ -11,7 +11,7 @@
+--- llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
++++ llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+@@ -10,7 +10,7 @@
+ // UNSUPPORTED: c++03, c++11
  // ALLOW_RETRIES: 2
  
- // dylib support for shared_mutex was added in macosx10.12
--// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}}
+-// XFAIL: availability-shared_mutex-missing
 +// XFAIL: *
  
  // <shared_mutex>
diff --git a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff
index dae292a0..9c4f834d 100644
--- a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff
+++ b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff
@@ -1,9 +1,9 @@
 if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library
 flags, otherwise add libgcc following how libunwind does the same
-Index: llvm-toolchain-snapshot_15~++20220517092516+a09af8669396/libcxxabi/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxxabi/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220517092516+a09af8669396.orig/libcxxabi/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220517092516+a09af8669396/libcxxabi/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxxabi/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxxabi/src/CMakeLists.txt
 @@ -77,7 +77,9 @@ else()
    add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
  endif()

From ca7040e1627846958407b382e9a0dd38be80c6fe Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 30 Mar 2023 11:23:32 +0200
Subject: [PATCH 027/349] llvm-debuginfod not installed anymore
 https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225

---
 debian/changelog           | 7 +++++++
 debian/llvm-X.Y.install.in | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9b9f1e7..09a7e48e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp2) UNRELEASED; urgency=medium
+
+  * llvm-debuginfod not installed anymore
+    https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 30 Mar 2023 11:23:10 +0200
+
 llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium
 
   * Snapshot is now 17
diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in
index edcdeaea..8ecef7dd 100644
--- a/debian/llvm-X.Y.install.in
+++ b/debian/llvm-X.Y.install.in
@@ -77,7 +77,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/yaml2obj
 usr/lib/llvm-@LLVM_VERSION@/bin/verify-uselistorder
 usr/lib/llvm-@LLVM_VERSION@/bin/sanstats
 usr/lib/llvm-@LLVM_VERSION@/bin/dsymutil
-usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod-find
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remark-size-diff
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remarkutil
@@ -158,7 +157,6 @@ usr/bin/yaml2obj-*
 usr/bin/verify-uselistorder-*
 usr/bin/sanstats-*
 usr/bin/dsymutil-*
-usr/bin/llvm-debuginfod-@LLVM_VERSION@
 usr/bin/llvm-debuginfod-find-*
 usr/bin/llvm-remark-size-diff-*
-usr/bin/llvm-debuginfo-analyzer-@LLVM_VERSION@
\ No newline at end of file
+usr/bin/llvm-debuginfo-analyzer-@LLVM_VERSION@

From 5dfdf2e8d4b7ee0aaa8b1fc8307b11559a2cb710 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 30 Mar 2023 14:07:42 +0200
Subject: [PATCH 028/349] rebase of the patches

---
 .../libcxx/libcxx-silent-test-libcxx.diff     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
index 69330c1c..e6a642b0 100644
--- a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
+++ b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
-+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/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,10 +11,10 @@ Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/
  #include <random>
  
  #include <cassert>
-Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/re/re.traits/isctype.pass.cpp
+Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/re/re.traits/isctype.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
-+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/re/re.traits/isctype.pass.cpp
+--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/re/re.traits/isctype.pass.cpp
 @@ -12,6 +12,7 @@
  
  // bool isctype(charT c, char_class_type f) const;
@@ -23,23 +23,23 @@ Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/
  
  #include <regex>
  #include <cassert>
-Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxxabi/test/catch_multi_level_pointer.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
-+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxxabi/test/catch_multi_level_pointer.pass.cpp
 @@ -11,6 +11,8 @@
  // 1b00fc5d8133 made it in the dylib in macOS 10.11
- // XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10}}
+ // XFAIL: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.{{9|10}}
  
 +// XFAIL: *
 +
  #include <cassert>
  #include <cstdio>
  #include <cstdlib>
-Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
-+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/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);

From 7694515f6045e15267708cfe2b6c56310e7a6cab Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 5 Apr 2023 13:41:53 +0200
Subject: [PATCH 029/349] fix the check if sccache

---
 debian/rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2fa75e5b..1721a5ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -583,9 +583,9 @@ override_dh_ocamlclean:
 override_dh_ocaml:
 
 override_dh_auto_configure: preconfigure
-	if test -f $(SCCACHE_CMD); then \
-		ls -al $(SCCACHE_PATH)*; \
-	fi
+ifeq (${SCCACHE_ENABLE},yes)
+	ls -al $(SCCACHE_PATH)*
+endif
 	echo "Using gcc: "
 	$(CC) -v
 	$(CXX) -v

From edb0f1f8cc18d7558c3c693f5f253670877da4d3 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 5 Apr 2023 13:43:21 +0200
Subject: [PATCH 030/349] also show DEB_BUILD_OPTIONS

---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 1721a5ac..abff1f43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -493,6 +493,7 @@ preconfigure:
 		echo "llvm spriv isn't detected while it should probably for this distro"; \
 	fi
 
+	@echo "DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)"
 	@echo "DEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)"
 	@echo "DEB_HOST_GNU_TYPE=$(DEB_HOST_GNU_TYPE)"
 	@echo "DEB_HOST_ARCH_BITS=$(DEB_HOST_ARCH_BITS)"

From 8e793b16a0a03bc9efad6f1f79bbb435fb50b517 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 6 Apr 2023 11:59:05 +0200
Subject: [PATCH 031/349] try the other syntax to show the variable

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index abff1f43..cc90564f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -507,7 +507,7 @@ preconfigure:
 	@echo "LLVM_VERSION_FULL=$(LLVM_VERSION_FULL)"
 	@echo "LLVM_VERSION_SNAPSHOT=$(LLVM_VERSION_SNAPSHOT)"
 	@echo "PATH=$(PATH)"
-	@echo "LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)"
+	@echo "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH"
 	@echo "RUNTIMES_CXXFLAGS=$(RUNTIMES_CXXFLAGS)"
 	@echo "STAGE_1_CXXFLAGS=$(STAGE_1_CXXFLAGS)"
 	@echo "STAGE_2_CFLAGS=$(STAGE_2_CFLAGS)"

From 83182e53431262517ef61c8925317cde7eaad4a2 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 6 Apr 2023 21:58:42 +0200
Subject: [PATCH 032/349] show if sccache is enabled or not

---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index cc90564f..eacca527 100755
--- a/debian/rules
+++ b/debian/rules
@@ -515,6 +515,7 @@ preconfigure:
 	@echo "LTO_ENABLE=$(LTO_ENABLE)"
 	@echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)"
 	@echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)"
+	@echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)"
 
 	for f in debian/*.in; do \
 		f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \

From eaa01deb495a359022d388c2fd8b840a65d4a05f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 7 Apr 2023 08:34:02 +0200
Subject: [PATCH 033/349] debug sccache call

---
 debian/rules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index eacca527..3f04751c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -483,7 +483,8 @@ PROJECTS_LIST := $(shell echo "$(PROJECTS)"|sed -e "s| ||g")
 RUNTIMES_LIST := $(shell echo "$(RUNTIMES)"|sed -e "s| ||g")
 
 preconfigure:
-
+	/opt/sccache/sccache||true
+	/opt/sccache/sccache --version||true
 	if ! grep -qs '/proc ' /proc/mounts; then \
 		echo "/proc needs to be mounted"; \
 		exit 1; \

From 196d18fafc2c1ecdf8e7a7d554997a4f965d846c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 7 Apr 2023 09:06:39 +0200
Subject: [PATCH 034/349] sccache: more debug info

---
 debian/rules | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/rules b/debian/rules
index 3f04751c..4374efa2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -469,7 +469,11 @@ ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes)
 		SCCACHE_CMD=$(SCCACHE_PATH)/sccache
 		SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD)
 		export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache
+	else
+$(info ************   /opt/sccache/sccache --version does no work ************)
 	endif
+else
+$(info ************  cannot find /opt/sccache/sccache ************)
 endif
 
 # enables cmake build targets like stage2-[target_name]

From 7aa59c6b92e36701ee9c70957602dfb047da0122 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 7 Apr 2023 09:13:05 +0200
Subject: [PATCH 035/349] sccache: more debug info 2

---
 debian/rules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 4374efa2..ce7b33fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -470,7 +470,8 @@ ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes)
 		SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD)
 		export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache
 	else
-$(info ************   /opt/sccache/sccache --version does no work ************)
+		D=$(shell /opt/sccache/sccache --version)
+$(info ************   /opt/sccache/sccache --version does no work $D ************)
 	endif
 else
 $(info ************  cannot find /opt/sccache/sccache ************)

From 0b40adb0b41eda0834b84a5f5bcf4ffe85a4649f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 7 Apr 2023 09:52:06 +0200
Subject: [PATCH 036/349] sccache: remove the version check

---
 debian/rules | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/rules b/debian/rules
index ce7b33fe..bb5c3ba7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -461,20 +461,14 @@ SCCACHE_ENABLE=no
 SCCACHE_CMAKE =
 # if sccache is installed in the chroot, use it
 ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes)
-	# check that it is working on this OS
-	ifeq ($(shell /opt/sccache/sccache --version && echo -n yes),yes)
-		STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE)
-		SCCACHE_ENABLE=yes
-		SCCACHE_PATH=/opt/sccache/
-		SCCACHE_CMD=$(SCCACHE_PATH)/sccache
-		SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD)
-		export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache
-	else
-		D=$(shell /opt/sccache/sccache --version)
-$(info ************   /opt/sccache/sccache --version does no work $D ************)
-	endif
+	STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE)
+	SCCACHE_ENABLE=yes
+	SCCACHE_PATH=/opt/sccache/
+	SCCACHE_CMD=$(SCCACHE_PATH)/sccache
+	SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD)
+	export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache
 else
-$(info ************  cannot find /opt/sccache/sccache ************)
+$(info ************  Cannot find /opt/sccache/sccache ************)
 endif
 
 # enables cmake build targets like stage2-[target_name]

From 742af03506e8c2abe873c080559521299a6a1efb Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 7 Apr 2023 10:09:08 +0200
Subject: [PATCH 037/349] sccache: as we know which archs are supported, just
 set it

---
 debian/rules | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index bb5c3ba7..b3976d9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -461,14 +461,14 @@ SCCACHE_ENABLE=no
 SCCACHE_CMAKE =
 # if sccache is installed in the chroot, use it
 ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes)
-	STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE)
-	SCCACHE_ENABLE=yes
-	SCCACHE_PATH=/opt/sccache/
-	SCCACHE_CMD=$(SCCACHE_PATH)/sccache
-	SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD)
-	export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache
-else
-$(info ************  Cannot find /opt/sccache/sccache ************)
+	ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
+		STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE)
+		SCCACHE_ENABLE=yes
+		SCCACHE_PATH=/opt/sccache/
+		SCCACHE_CMD=$(SCCACHE_PATH)/sccache
+		SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD)
+		export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache
+	endif
 endif
 
 # enables cmake build targets like stage2-[target_name]

From 65b2d98cb8206ad72aa31d5e14fbd2e039c82ce5 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 7 Apr 2023 10:18:33 +0200
Subject: [PATCH 038/349] remove debug message

---
 debian/rules | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index b3976d9d..6ef4a94e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -482,8 +482,6 @@ PROJECTS_LIST := $(shell echo "$(PROJECTS)"|sed -e "s| ||g")
 RUNTIMES_LIST := $(shell echo "$(RUNTIMES)"|sed -e "s| ||g")
 
 preconfigure:
-	/opt/sccache/sccache||true
-	/opt/sccache/sccache --version||true
 	if ! grep -qs '/proc ' /proc/mounts; then \
 		echo "/proc needs to be mounted"; \
 		exit 1; \

From a6b0eb211a5c36079d90e755b46fb417ea518da1 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 11 Apr 2023 10:36:53 +0200
Subject: [PATCH 039/349] rebase of the patches

---
 .../patches/clang-analyzer-force-version.diff |  6 +-
 debian/patches/clang-tidy-run-bin.diff        |  6 +-
 debian/patches/fix-scan-view-path.diff        |  6 +-
 ...ddversion-suffix-to-llvm-server-exec.patch |  6 +-
 debian/patches/openmp-fix-runtimes-build.diff | 56 +++++++++++++++++++
 debian/patches/python-clangpath.diff          |  8 +--
 debian/patches/scan-build-clang-path.diff     |  8 +--
 .../scan-build-py-fix-default-bin.diff        |  6 +-
 debian/patches/silent-MCJIIT-tests.diff       | 16 +++---
 9 files changed, 87 insertions(+), 31 deletions(-)

diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff
index e87071d7..f364728c 100644
--- a/debian/patches/clang-analyzer-force-version.diff
+++ b/debian/patches/clang-analyzer-force-version.diff
@@ -1,10 +1,10 @@
 # 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_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/libexec/ccc-analyzer
+Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/libexec/ccc-analyzer
 ===================================================================
---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/clang/tools/scan-build/libexec/ccc-analyzer
-+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/libexec/ccc-analyzer
+--- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/tools/scan-build/libexec/ccc-analyzer
++++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/libexec/ccc-analyzer
 @@ -93,7 +93,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
    if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
  
diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff
index aeaa9447..b45f7338 100644
--- a/debian/patches/clang-tidy-run-bin.diff
+++ b/debian/patches/clang-tidy-run-bin.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+Index: llvm-toolchain-snapshot_17~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-+++ llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+--- llvm-toolchain-snapshot_17~++20220525112612+8919447c71ab.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ llvm-toolchain-snapshot_17~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 @@ -225,8 +225,10 @@ def main():
                        action='store_true', help='allow alpha checkers from '
                                                  'clang-analyzer.')
diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff
index 1566f5a0..ee310efe 100644
--- a/debian/patches/fix-scan-view-path.diff
+++ b/debian/patches/fix-scan-view-path.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20200326162000+4673699a470/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-snapshot_16~++20200326162000+4673699a470.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-snapshot_16~++20200326162000+4673699a470/clang/tools/scan-view/bin/scan-view
+--- llvm-toolchain-snapshot_17~++20200326172000+4673699a470.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view
 @@ -28,6 +28,7 @@ kDefaultPort = 8181
  kMaxPortsToTry = 100
  
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 1ad147d9..7c58970c 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,10 +12,10 @@ which could then break something else.
 
 This probably should have upstream bug but I couldn't find any existing report.
 
-Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+--- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
++++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 @@ -34,6 +34,7 @@
  #include "lldb/Utility/StreamString.h"
  #include "llvm/ADT/SmallString.h"
diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 17832e00..b8a7e1f4 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -1,10 +1,17 @@
 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
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/llvm/runtimes/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -231,6 +231,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}
@@ -22,10 +29,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/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)
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -91,6 +91,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
@@ -55,10 +69,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/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)
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -68,10 +89,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -56,6 +56,8 @@ add_dependencies(omptarget.rtl.cuda ompt
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -81,10 +109,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/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 
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/src/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/src/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/src/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -35,7 +35,9 @@ add_llvm_library(omptarget
    PRIVATE
    "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
@@ -96,10 +131,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  # libomptarget.so needs to be aware of where the plugins live as they
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -111,10 +153,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/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?")
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/src/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/src/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/src/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -132,10 +181,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/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)
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/tools/archer/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/tools/archer/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/tools/archer/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT)
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)
diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff
index 2c2571f8..8f22a5d5 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_16~++20211116120952+5b4bfd8c2416/clang/bindings/python/clang/cindex.py
+Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/bindings/python/clang/cindex.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/clang/bindings/python/clang/cindex.py
-+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/bindings/python/clang/cindex.py
-@@ -4162,7 +4162,7 @@ class Config(object):
+--- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/bindings/python/clang/cindex.py
++++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/bindings/python/clang/cindex.py
+@@ -4172,7 +4172,7 @@ class Config(object):
          elif name == 'Windows':
              file = 'libclang.dll'
          else:
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 083bff48..1a3c5a37 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -2,11 +2,11 @@
  clang/tools/scan-build/bin/scan-build |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/bin/scan-build
+Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/bin/scan-build
 ===================================================================
---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/clang/tools/scan-build/bin/scan-build
-+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/bin/scan-build
-@@ -1686,7 +1686,7 @@ sub FindClang {
+--- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/tools/scan-build/bin/scan-build
++++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/bin/scan-build
+@@ -1786,7 +1786,7 @@ sub FindClang {
    if (!defined $Options{AnalyzerDiscoveryMethod}) {
      $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
      if (!defined $Clang || ! -x $Clang) {
diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff
index 22a6dfca..8a433d6c 100644
--- a/debian/patches/scan-build-py-fix-default-bin.diff
+++ b/debian/patches/scan-build-py-fix-default-bin.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
+Index: llvm-toolchain-snapshot_17~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
-+++ llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
+--- llvm-toolchain-snapshot_17~++20210717105643+f95d26006e06.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
++++ llvm-toolchain-snapshot_17~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
 @@ -266,7 +266,7 @@ def create_analyze_parser(from_build_com
          '--use-analyzer',
          metavar='<path>',
diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff
index 94f56a31..487788a4 100644
--- a/debian/patches/silent-MCJIIT-tests.diff
+++ b/debian/patches/silent-MCJIIT-tests.diff
@@ -18,27 +18,27 @@
  test/Feature/load_module.ll                                             |    1 -
  17 files changed, 14 insertions(+), 17 deletions(-)
 
-Index: llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_17~++20230411103522+cd91992de838.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
 @@ -1,6 +1,6 @@
  ; RUN: %lli -jit-kind=mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
  ; RUN:   -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}}
 +; XFAIL: *
  ; XFAIL: target={{.*-windows-(gnu|msvc)}}
+ ; REQUIRES: thread_support
  ; UNSUPPORTED: target=target=powerpc64-unknown-linux-gnu
- ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
-Index: llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_17~++20230411103522+cd91992de838.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
 @@ -1,6 +1,6 @@
  ; RUN: %lli -jit-kind=mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
  ; RUN:   -O0 -relocation-model=pic -code-model=small %s
 -; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}}
 +; XFAIL: *
  ; XFAIL: target={{.*-windows-(gnu|msvc)}}
+ ; REQUIRES: thread_support
  ; UNSUPPORTED: target=powerpc64-unknown-linux-gnu
- ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed

From e026db77d30b91cbe986d8ab15d6d7d847a9cfd3 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 11 Apr 2023 19:53:01 +0200
Subject: [PATCH 040/349] erebase of the patches

---
 debian/patches/openmp-fix-runtimes-build.diff | 111 +++++-------------
 1 file changed, 28 insertions(+), 83 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index b8a7e1f4..029184b3 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,17 +2,11 @@ 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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
-=======
-Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CMakeLists.txt
->>>>>>> Stashed changes
-@@ -231,6 +231,7 @@ function(runtime_default_target)
+--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/llvm/runtimes/CMakeLists.txt
+@@ -236,6 +236,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}
                                        -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS}
@@ -20,7 +14,7 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CM
                                        -DCMAKE_C_COMPILER_WORKS=ON
                                        -DCMAKE_CXX_COMPILER_WORKS=ON
                                        -DCMAKE_ASM_COMPILER_WORKS=ON
-@@ -480,7 +481,7 @@ if(runtimes)
+@@ -496,7 +497,7 @@ if(runtimes)
      # build directory cannot find the C++ headers in certain configurations.
      # I need to build a mechanism for runtime projects to provide CMake code
      # that executes at LLVM configuration time to handle this case.
@@ -29,17 +23,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/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)
-<<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
-=======
-Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/CMakeLists.txt
->>>>>>> Stashed changes
+--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/CMakeLists.txt
 @@ -91,6 +91,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
@@ -69,17 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/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)
-<<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/CMakeLists.txt
-=======
-Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/CMakeLists.txt
->>>>>>> Stashed changes
+--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -89,18 +69,11 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-<<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-=======
-Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/cuda/CMakeLists.txt
->>>>>>> Stashed changes
-@@ -56,6 +56,8 @@ add_dependencies(omptarget.rtl.cuda ompt
+--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+@@ -55,6 +55,8 @@ endif()
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
@@ -109,17 +82,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/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 
-<<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
-=======
-Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/src/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/src/CMakeLists.txt
->>>>>>> Stashed changes
+--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/src/CMakeLists.txt
 @@ -35,7 +35,9 @@ add_llvm_library(omptarget
    PRIVATE
    "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
@@ -131,17 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  # libomptarget.so needs to be aware of where the plugins live as they
-<<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/CMakeLists.txt
-=======
-Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/CMakeLists.txt
->>>>>>> Stashed changes
+--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -153,17 +112,10 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/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?")
-<<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
-=======
-Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/src/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/src/CMakeLists.txt
->>>>>>> Stashed changes
+--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/src/CMakeLists.txt
 @@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -181,18 +133,11 @@ Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/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)
-<<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
-=======
-Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/tools/archer/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/tools/archer/CMakeLists.txt
->>>>>>> Stashed changes
-@@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT)
+--- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/tools/archer/CMakeLists.txt
+@@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)
  

From e8ff2b4a8c63ad25f7dbf64f058ce3a7bdbb4930 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 17 Apr 2023 13:50:34 +0200
Subject: [PATCH 041/349] bring back the coverity support. gone in a merge

---
 debian/rules | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/debian/rules b/debian/rules
index e8dec384..e6f59d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -471,6 +471,23 @@ ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes)
 	endif
 endif
 
+COVERITY_ENABLE=0
+ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS)))
+# enable the build using coverity
+# pbuilder contains BINDMOUNTS="/opt/cov-analysis/"
+# And we have some pbuilder hooks to configure and pack the result
+# Where the binaries are installed on the jenkins instance
+        PRE_PROCESS=PATH=$$PATH:/opt/cov-analysis/bin/ cov-build --dir cov-int
+# We don't want to check the temporary files produced by the configure
+        PRE_PROCESS_CONF=
+        COVERITY_ENABLE=1
+        CONFIGURE_EXTRA += --enable-assertions
+        STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON
+		SCCACHE_ENABLE=no
+# no need to run tests in this case
+        RUN_TEST=no
+endif
+
 # enables cmake build targets like stage2-[target_name]
 ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clang-tools;check-lld;check-libcxx;check-libcxxabi;check-mlir;check-sanitizer;llvm-config;test-suite
 

From 3e1b8a9eac35cd90abcc8c791dec7751fd666df6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 29 Apr 2023 10:12:21 +0200
Subject: [PATCH 042/349] rebase of the patches

---
 debian/patches/symbolizer-path.diff | 31 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/patches/symbolizer-path.diff b/debian/patches/symbolizer-path.diff
index fab32bb2..d94593d3 100644
--- a/debian/patches/symbolizer-path.diff
+++ b/debian/patches/symbolizer-path.diff
@@ -1,19 +1,20 @@
-Index: llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
-+++ llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
-@@ -25,6 +25,10 @@
- #include "sanitizer_symbolizer_internal.h"
- #include "sanitizer_symbolizer_libbacktrace.h"
- #include "sanitizer_symbolizer_mac.h"
+--- llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
++++ llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+@@ -33,6 +33,11 @@
+ #  include "sanitizer_symbolizer_libbacktrace.h"
+ #  include "sanitizer_symbolizer_mac.h"
+ 
 +#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR
 +
 +#define TOSTR2(X) #X
 +#define TOSTR(X) TOSTR2(X)
- 
- #include <dlfcn.h>   // for dlsym()
- #include <errno.h>
-@@ -452,7 +456,7 @@ static SymbolizerTool *ChooseExternalSym
++
+ // C++ demangling function, as required by Itanium C++ ABI. This is weak,
+ // because we do not require a C++ ABI library to be linked to a program
+ // using sanitizers; if it's not present, we'll just use the mangled name.
+@@ -451,7 +456,7 @@ static SymbolizerTool *ChooseExternalSym
      return new(*allocator) AtosSymbolizer(found_path, allocator);
    }
  #endif  // SANITIZER_APPLE
@@ -22,11 +23,11 @@ Index: llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/
      VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
      return new(*allocator) LLVMSymbolizer(found_path, allocator);
    }
-Index: llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/CMakeLists.txt
-@@ -202,6 +202,7 @@ set(SANITIZER_IMPL_HEADERS
+--- llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+@@ -203,6 +203,7 @@ set(SANITIZER_IMPL_HEADERS
    )
  
  include_directories(..)

From 507ed2aae32328bde7cdede77054f7357cea456b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 1 May 2023 08:27:46 +0200
Subject: [PATCH 043/349] rebase of the patches

---
 debian/patches/openmp-fix-runtimes-build.diff | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 029184b3..c252ae3e 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/llvm/runtimes/CMakeLists.txt
 @@ -236,6 +236,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}
@@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/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_17~++20230411103725+b8917ac62ad4/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/CMakeLists.txt
 @@ -91,6 +91,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
@@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/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_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -55,6 +55,8 @@ endif()
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -82,13 +82,13 @@ Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/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_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/libomptarget/src/CMakeLists.txt
-@@ -35,7 +35,9 @@ add_llvm_library(omptarget
-   PRIVATE
-   "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
+--- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/src/CMakeLists.txt
+@@ -32,7 +32,9 @@ add_llvm_library(omptarget
+   Object
+ 
    NO_INSTALL_RPATH
 -)
 +  )
@@ -96,11 +96,11 @@ Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/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_17~++20230411103725+b8917ac62ad4/openmp/runtime/CMakeLists.txt
+ if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
+Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -112,10 +112,10 @@ Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/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_17~++20230411103725+b8917ac62ad4/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/runtime/src/CMakeLists.txt
 @@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/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_17~++20230411103725+b8917ac62ad4/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230411103725+b8917ac62ad4/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)

From 263547f3b74abfa268aaf1b6427981c954a8c296 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 7 May 2023 10:47:19 +0200
Subject: [PATCH 044/349] rebase of the patches

---
 debian/patches/openmp-fix-runtimes-build.diff | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index c252ae3e..d5e5b2d4 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/llvm/runtimes/CMakeLists.txt
 @@ -236,6 +236,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}
@@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/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_17~++20230501082440+687542413531/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/CMakeLists.txt
 @@ -91,6 +91,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
@@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/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_17~++20230501082440+687542413531/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -55,6 +55,8 @@ endif()
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -82,12 +82,12 @@ Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/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_17~++20230501082440+687542413531/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptarget/src/CMakeLists.txt
-@@ -32,7 +32,9 @@ add_llvm_library(omptarget
-   Object
+--- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/src/CMakeLists.txt
+@@ -36,7 +36,9 @@ add_llvm_library(omptarget
+   omp
  
    NO_INSTALL_RPATH
 -)
@@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -112,10 +112,10 @@ Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/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_17~++20230501082440+687542413531/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/src/CMakeLists.txt
 @@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230501082440+687542413531/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_17~++20230501082440+687542413531/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230501082440+687542413531.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230501082440+687542413531/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)

From 57b722ea4a86fff6fe4c6ce26d331db9ca75292e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 7 May 2023 19:51:01 +0200
Subject: [PATCH 045/349] refresh debian/control

---
 debian/control | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 873b4153..dbdbc142 100644
--- a/debian/control
+++ b/debian/control
@@ -35,8 +35,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
 Build-Conflicts: oprofile
 Standards-Version: 4.6.2
 Homepage: https://www.llvm.org/
-Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 16
-Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/16
+Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot
+Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot
 
 # ------------- clang -------------
 
@@ -168,7 +168,8 @@ Description: Clang library - Development package
 Package: libclang-common-17-dev
 Architecture: all
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (>= ${source:Version}),
+ libllvm17 (<< ${source:Version}.1~)
 Recommends: libclang-rt-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end

From 2f8cbb7e18754c5e35f644378ea4aa83e88a963f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 7 May 2023 19:52:59 +0200
Subject: [PATCH 046/349] revert the mbstate-revert-issue-62523.patch

---
 .../patches/mbstate-revert-issue-62523.patch  | 211 ++++++++++++++++++
 debian/patches/series                         |   1 +
 2 files changed, 212 insertions(+)
 create mode 100644 debian/patches/mbstate-revert-issue-62523.patch

diff --git a/debian/patches/mbstate-revert-issue-62523.patch b/debian/patches/mbstate-revert-issue-62523.patch
new file mode 100644
index 00000000..c6290f8a
--- /dev/null
+++ b/debian/patches/mbstate-revert-issue-62523.patch
@@ -0,0 +1,211 @@
+commit a595b931f1f91897317a4257df313bddfeb029a6
+Author: Ian Anderson <iana@apple.com>
+Date:   Mon Apr 17 09:38:38 2023 -0700
+
+    [libc++] cuchar redeclares ::mbstate_t when it's in its own clang module
+    
+    When cuchar is compiled independently on platforms that don't have <uchar.h>, it doesn't get a declaration of mbstate_t, and so makes an empty declaration for ::mbstate_t. That conflicts with the declarations in __mbstate_t.h and cwchar since both of those headers do get mbstate_t before making ::mbstate_t.
+    
+    Change `__mbstate_t.h` to just get the underlying declaration for mbstate_t and not make a declaration for ::mbstate_t. Include __mbstate_t.h in uchar.h and wchar.h when their next headers aren't available so that at least mbstate_t gets defined.
+    
+    Add __std_mbstate_t.h to declare ::mbstate_t for headers that need that when cuchar or cwchar aren't available (because either _LIBCPP_HAS_NO_WIDE_CHARACTERS or _LIBCPP_CXX03_LANG).
+    
+    Reviewed By: ldionne, Mordante, #libc, philnik
+    
+    Differential Revision: https://reviews.llvm.org/D148542
+
+diff --git b/libcxx/include/CMakeLists.txt a/libcxx/include/CMakeLists.txt
+index 356af6db8f6c..fa64cec327e6 100644
+--- b/libcxx/include/CMakeLists.txt
++++ a/libcxx/include/CMakeLists.txt
+@@ -614,7 +614,6 @@ set(files
+   __ranges/views.h
+   __ranges/zip_view.h
+   __split_buffer
+-  __std_mbstate_t.h
+   __string/char_traits.h
+   __string/constexpr_c_functions.h
+   __string/extern_template_lists.h
+diff --git b/libcxx/include/__locale a/libcxx/include/__locale
+index a812427acba4..994613083cdf 100644
+--- b/libcxx/include/__locale
++++ a/libcxx/include/__locale
+@@ -25,8 +25,6 @@
+ 
+ #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+ #  include <cwchar>
+-#else
+-#  include <__std_mbstate_t.h>
+ #endif
+ 
+ #if defined(_LIBCPP_MSVCRT_LIKE)
+diff --git b/libcxx/include/__mbstate_t.h a/libcxx/include/__mbstate_t.h
+index d793787fa0cd..487a6d092c71 100644
+--- b/libcxx/include/__mbstate_t.h
++++ a/libcxx/include/__mbstate_t.h
+@@ -16,27 +16,29 @@
+ #  pragma GCC system_header
+ #endif
+ 
+-// The goal of this header is to provide mbstate_t without requiring all of
+-// <uchar.h> or <wchar.h>. It's also used by the libc++ versions of <uchar.h>
+-// and <wchar.h> to get mbstate_t when the C library doesn't provide <uchar.h>
+-// or <wchar.h>, hence the #include_next of those headers instead of #include.
+-// (e.g. if <wchar.h> isn't present in the C library, the libc++ <wchar.h>
+-// will include this header. This header needs to not turn around and cyclically
+-// include <wchar.h>, but fall through to <uchar.h>.)
++// TODO(ldionne):
++// The goal of this header is to provide mbstate_t without having to pull in
++// <wchar.h> or <uchar.h>. This is necessary because we need that type even
++// when we don't have (or try to provide) support for wchar_t, because several
++// types like std::fpos are defined in terms of mbstate_t.
+ //
+-// This does not define std::mbstate_t -- this only brings in the declaration
+-// in the global namespace.
++// This is a gruesome hack, but I don't know how to make it cleaner for
++// the time being.
+ 
+-#if __has_include(<bits/types/mbstate_t.h>)
++#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
++#   include <wchar.h> // for mbstate_t
++#elif __has_include(<bits/types/mbstate_t.h>)
+ #   include <bits/types/mbstate_t.h> // works on most Unixes
+ #elif __has_include(<sys/_types/_mbstate_t.h>)
+ #   include <sys/_types/_mbstate_t.h> // works on Darwin
+-#elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>)
+-#   include_next <wchar.h> // fall back to the C standard provider of mbstate_t
+-#elif __has_include_next(<uchar.h>)
+-#   include_next <uchar.h> // <uchar.h> is also required to make mbstate_t visible
+ #else
+-#   error "We don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
++#   error "The library was configured without support for wide-characters, but we don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
+ #endif
+ 
++_LIBCPP_BEGIN_NAMESPACE_STD
++
++using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
++
++_LIBCPP_END_NAMESPACE_STD
++
+ #endif // _LIBCPP___MBSTATE_T_H
+diff --git b/libcxx/include/__std_mbstate_t.h a/libcxx/include/__std_mbstate_t.h
+deleted file mode 100644
+index e79cc789fddf..000000000000
+--- b/libcxx/include/__std_mbstate_t.h
++++ /dev/null
+@@ -1,29 +0,0 @@
+-// -*- C++ -*-
+-//===----------------------------------------------------------------------===//
+-//
+-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+-// See https://llvm.org/LICENSE.txt for license information.
+-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+-//
+-//===----------------------------------------------------------------------===//
+-
+-#ifndef _LIBCPP___STD_MBSTATE_T_H
+-#define _LIBCPP___STD_MBSTATE_T_H
+-
+-#include <__config>
+-#include <__mbstate_t.h>
+-
+-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+-#  pragma GCC system_header
+-#endif
+-
+-// The goal of this header is to provide std::mbstate_t without requiring all
+-// of <cuchar> or <cwchar>.
+-
+-_LIBCPP_BEGIN_NAMESPACE_STD
+-
+-using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
+-
+-_LIBCPP_END_NAMESPACE_STD
+-
+-#endif // _LIBCPP___STD_MBSTATE_T_H
+diff --git b/libcxx/include/iosfwd a/libcxx/include/iosfwd
+index e3cd9faa70b7..0af7df30d8fd 100644
+--- b/libcxx/include/iosfwd
++++ a/libcxx/include/iosfwd
+@@ -103,7 +103,7 @@ using u32streampos = fpos<char_traits<char32_t>::state_type>;
+ #include <__fwd/sstream.h>
+ #include <__fwd/streambuf.h>
+ #include <__fwd/string.h>
+-#include <__std_mbstate_t.h>
++#include <__mbstate_t.h>
+ #include <version>
+ 
+ #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+diff --git b/libcxx/include/module.modulemap.in a/libcxx/include/module.modulemap.in
+index 99907787132b..01f763d764e6 100644
+--- b/libcxx/include/module.modulemap.in
++++ a/libcxx/include/module.modulemap.in
+@@ -1735,7 +1735,6 @@ module std [system] {
+   module __mbstate_t         { private header "__mbstate_t.h"       export * }
+   module __node_handle       { private header "__node_handle"       export * }
+   module __split_buffer      { private header "__split_buffer"      export * }
+-  module __std_mbstate_t     { private header "__std_mbstate_t.h"   export * }
+   module __threading_support {         header "__threading_support" export * }
+   module __tree              {         header "__tree"              export * }
+   module __undef_macros      {         header "__undef_macros"      export * }
+diff --git b/libcxx/include/uchar.h a/libcxx/include/uchar.h
+index 546113f7eab4..3a51bb7a9f61 100644
+--- b/libcxx/include/uchar.h
++++ a/libcxx/include/uchar.h
+@@ -42,12 +42,10 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps);
+ 
+ // Some platforms don't implement <uchar.h> and we don't want to give a hard
+ // error on those platforms. When the platform doesn't provide <uchar.h>, at
+-// least include <stddef.h> so we get the declaration for size_t, and try to
+-// get the declaration of mbstate_t too.
++// least include <stddef.h> so we get the declaration for size_t.
+ #if __has_include_next(<uchar.h>)
+ # include_next <uchar.h>
+ #else
+-# include <__mbstate_t.h>
+ # include <stddef.h>
+ #endif
+ 
+diff --git b/libcxx/include/wchar.h a/libcxx/include/wchar.h
+index db624cea2bee..c684508dc2cc 100644
+--- b/libcxx/include/wchar.h
++++ a/libcxx/include/wchar.h
+@@ -122,8 +122,6 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
+ 
+ #  if __has_include_next(<wchar.h>)
+ #    include_next <wchar.h>
+-#  else
+-#    include <__mbstate_t.h> // make sure we have mbstate_t regardless of the existence of <wchar.h>
+ #  endif
+ 
+ // Determine whether we have const-correct overloads for wcschr and friends.
+diff --git b/libcxx/test/libcxx/private_headers.verify.cpp a/libcxx/test/libcxx/private_headers.verify.cpp
+index 0720e1f72a77..48b9a7f8c574 100644
+--- b/libcxx/test/libcxx/private_headers.verify.cpp
++++ a/libcxx/test/libcxx/private_headers.verify.cpp
+@@ -614,7 +614,6 @@ END-SCRIPT
+ #include <__ranges/views.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/views.h'}}
+ #include <__ranges/zip_view.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/zip_view.h'}}
+ #include <__split_buffer> // expected-error@*:* {{use of private header from outside its module: '__split_buffer'}}
+-#include <__std_mbstate_t.h> // expected-error@*:* {{use of private header from outside its module: '__std_mbstate_t.h'}}
+ #include <__string/char_traits.h> // expected-error@*:* {{use of private header from outside its module: '__string/char_traits.h'}}
+ #include <__string/constexpr_c_functions.h> // expected-error@*:* {{use of private header from outside its module: '__string/constexpr_c_functions.h'}}
+ #include <__string/extern_template_lists.h> // expected-error@*:* {{use of private header from outside its module: '__string/extern_template_lists.h'}}
+diff --git b/libcxx/utils/generate_iwyu_mapping.py a/libcxx/utils/generate_iwyu_mapping.py
+index f8377a976f08..cb27d4677395 100644
+--- b/libcxx/utils/generate_iwyu_mapping.py
++++ a/libcxx/utils/generate_iwyu_mapping.py
+@@ -56,12 +56,11 @@ def generate_map(include):
+         elif i == '__pstl_memory': continue
+         elif i == '__pstl_numeric': continue
+         elif i == '__split_buffer': public = ['deque', 'vector']
+-        elif i == '__std_mbstate_t.h': continue
+         elif i == '__threading_support': public = ['atomic', 'mutex', 'semaphore', 'thread']
+         elif i == '__tree': public = ['map', 'set']
+         elif i == '__undef_macros': continue
+         elif i == '__verbose_abort': continue
+-        else: panic(i)
++        else: panic()
+ 
+         for p in public:
+             result.append(f'{generate(f"<{i}>", p)},')
diff --git a/debian/patches/series b/debian/patches/series
index f2744617..0878cd13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,3 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
+mbstate-revert-issue-62523.patch

From 0279840b6c39692cd1c0269e5d8630a4b2876903 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 7 May 2023 19:55:22 +0200
Subject: [PATCH 047/349] rebase of the patches

---
 .../patches/mbstate-revert-issue-62523.patch  | 89 +++++++++----------
 1 file changed, 44 insertions(+), 45 deletions(-)

diff --git a/debian/patches/mbstate-revert-issue-62523.patch b/debian/patches/mbstate-revert-issue-62523.patch
index c6290f8a..080961ec 100644
--- a/debian/patches/mbstate-revert-issue-62523.patch
+++ b/debian/patches/mbstate-revert-issue-62523.patch
@@ -14,11 +14,11 @@ Date:   Mon Apr 17 09:38:38 2023 -0700
     
     Differential Revision: https://reviews.llvm.org/D148542
 
-diff --git b/libcxx/include/CMakeLists.txt a/libcxx/include/CMakeLists.txt
-index 356af6db8f6c..fa64cec327e6 100644
---- b/libcxx/include/CMakeLists.txt
-+++ a/libcxx/include/CMakeLists.txt
-@@ -614,7 +614,6 @@ set(files
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/CMakeLists.txt
+@@ -615,7 +615,6 @@ set(files
    __ranges/views.h
    __ranges/zip_view.h
    __split_buffer
@@ -26,10 +26,10 @@ index 356af6db8f6c..fa64cec327e6 100644
    __string/char_traits.h
    __string/constexpr_c_functions.h
    __string/extern_template_lists.h
-diff --git b/libcxx/include/__locale a/libcxx/include/__locale
-index a812427acba4..994613083cdf 100644
---- b/libcxx/include/__locale
-+++ a/libcxx/include/__locale
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__locale
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/__locale
++++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__locale
 @@ -25,8 +25,6 @@
  
  #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
@@ -39,10 +39,10 @@ index a812427acba4..994613083cdf 100644
  #endif
  
  #if defined(_LIBCPP_MSVCRT_LIKE)
-diff --git b/libcxx/include/__mbstate_t.h a/libcxx/include/__mbstate_t.h
-index d793787fa0cd..487a6d092c71 100644
---- b/libcxx/include/__mbstate_t.h
-+++ a/libcxx/include/__mbstate_t.h
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__mbstate_t.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/__mbstate_t.h
++++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__mbstate_t.h
 @@ -16,27 +16,29 @@
  #  pragma GCC system_header
  #endif
@@ -88,10 +88,9 @@ index d793787fa0cd..487a6d092c71 100644
 +_LIBCPP_END_NAMESPACE_STD
 +
  #endif // _LIBCPP___MBSTATE_T_H
-diff --git b/libcxx/include/__std_mbstate_t.h a/libcxx/include/__std_mbstate_t.h
-deleted file mode 100644
-index e79cc789fddf..000000000000
---- b/libcxx/include/__std_mbstate_t.h
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__std_mbstate_t.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/__std_mbstate_t.h
 +++ /dev/null
 @@ -1,29 +0,0 @@
 -// -*- C++ -*-
@@ -123,11 +122,11 @@ index e79cc789fddf..000000000000
 -_LIBCPP_END_NAMESPACE_STD
 -
 -#endif // _LIBCPP___STD_MBSTATE_T_H
-diff --git b/libcxx/include/iosfwd a/libcxx/include/iosfwd
-index e3cd9faa70b7..0af7df30d8fd 100644
---- b/libcxx/include/iosfwd
-+++ a/libcxx/include/iosfwd
-@@ -103,7 +103,7 @@ using u32streampos = fpos<char_traits<char32_t>::state_type>;
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/iosfwd
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/iosfwd
++++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/iosfwd
+@@ -103,7 +103,7 @@ using u32streampos = fpos<char_traits<ch
  #include <__fwd/sstream.h>
  #include <__fwd/streambuf.h>
  #include <__fwd/string.h>
@@ -136,11 +135,11 @@ index e3cd9faa70b7..0af7df30d8fd 100644
  #include <version>
  
  #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-diff --git b/libcxx/include/module.modulemap.in a/libcxx/include/module.modulemap.in
-index 99907787132b..01f763d764e6 100644
---- b/libcxx/include/module.modulemap.in
-+++ a/libcxx/include/module.modulemap.in
-@@ -1735,7 +1735,6 @@ module std [system] {
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/module.modulemap.in
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/module.modulemap.in
++++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/module.modulemap.in
+@@ -1743,7 +1743,6 @@ module std [system] {
    module __mbstate_t         { private header "__mbstate_t.h"       export * }
    module __node_handle       { private header "__node_handle"       export * }
    module __split_buffer      { private header "__split_buffer"      export * }
@@ -148,11 +147,11 @@ index 99907787132b..01f763d764e6 100644
    module __threading_support {         header "__threading_support" export * }
    module __tree              {         header "__tree"              export * }
    module __undef_macros      {         header "__undef_macros"      export * }
-diff --git b/libcxx/include/uchar.h a/libcxx/include/uchar.h
-index 546113f7eab4..3a51bb7a9f61 100644
---- b/libcxx/include/uchar.h
-+++ a/libcxx/include/uchar.h
-@@ -42,12 +42,10 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps);
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/uchar.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/uchar.h
++++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/uchar.h
+@@ -42,12 +42,10 @@ size_t c32rtomb(char* s, char32_t c32, m
  
  // Some platforms don't implement <uchar.h> and we don't want to give a hard
  // error on those platforms. When the platform doesn't provide <uchar.h>, at
@@ -166,11 +165,11 @@ index 546113f7eab4..3a51bb7a9f61 100644
  # include <stddef.h>
  #endif
  
-diff --git b/libcxx/include/wchar.h a/libcxx/include/wchar.h
-index db624cea2bee..c684508dc2cc 100644
---- b/libcxx/include/wchar.h
-+++ a/libcxx/include/wchar.h
-@@ -122,8 +122,6 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/wchar.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/wchar.h
++++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/wchar.h
+@@ -122,8 +122,6 @@ size_t wcsrtombs(char* restrict dst, con
  
  #  if __has_include_next(<wchar.h>)
  #    include_next <wchar.h>
@@ -179,10 +178,10 @@ index db624cea2bee..c684508dc2cc 100644
  #  endif
  
  // Determine whether we have const-correct overloads for wcschr and friends.
-diff --git b/libcxx/test/libcxx/private_headers.verify.cpp a/libcxx/test/libcxx/private_headers.verify.cpp
-index 0720e1f72a77..48b9a7f8c574 100644
---- b/libcxx/test/libcxx/private_headers.verify.cpp
-+++ a/libcxx/test/libcxx/private_headers.verify.cpp
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/test/libcxx/private_headers.verify.cpp
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/test/libcxx/private_headers.verify.cpp
++++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/test/libcxx/private_headers.verify.cpp
 @@ -614,7 +614,6 @@ END-SCRIPT
  #include <__ranges/views.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/views.h'}}
  #include <__ranges/zip_view.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/zip_view.h'}}
@@ -191,10 +190,10 @@ index 0720e1f72a77..48b9a7f8c574 100644
  #include <__string/char_traits.h> // expected-error@*:* {{use of private header from outside its module: '__string/char_traits.h'}}
  #include <__string/constexpr_c_functions.h> // expected-error@*:* {{use of private header from outside its module: '__string/constexpr_c_functions.h'}}
  #include <__string/extern_template_lists.h> // expected-error@*:* {{use of private header from outside its module: '__string/extern_template_lists.h'}}
-diff --git b/libcxx/utils/generate_iwyu_mapping.py a/libcxx/utils/generate_iwyu_mapping.py
-index f8377a976f08..cb27d4677395 100644
---- b/libcxx/utils/generate_iwyu_mapping.py
-+++ a/libcxx/utils/generate_iwyu_mapping.py
+Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/utils/generate_iwyu_mapping.py
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/utils/generate_iwyu_mapping.py
++++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/utils/generate_iwyu_mapping.py
 @@ -56,12 +56,11 @@ def generate_map(include):
          elif i == '__pstl_memory': continue
          elif i == '__pstl_numeric': continue

From 36803a749cadd8005d426d2288c42a1dcf8ec539 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 11 May 2023 11:24:25 +0200
Subject: [PATCH 048/349] disable patch to see if it works

---
 debian/patches/series | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/series b/debian/patches/series
index 0878cd13..3cb1d87a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-mbstate-revert-issue-62523.patch
+#mbstate-revert-issue-62523.patch

From 3012cf5977cd3326dd7aab84fde79304d8458d85 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 11 May 2023 23:30:59 +0200
Subject: [PATCH 049/349] mbstate try mbstate-D150322.diff

---
 debian/patches/mbstate-D150322.diff           |  69 ++++++
 .../patches/mbstate-revert-issue-62523.patch  | 210 ------------------
 debian/patches/series                         |   2 +-
 3 files changed, 70 insertions(+), 211 deletions(-)
 create mode 100644 debian/patches/mbstate-D150322.diff
 delete mode 100644 debian/patches/mbstate-revert-issue-62523.patch

diff --git a/debian/patches/mbstate-D150322.diff b/debian/patches/mbstate-D150322.diff
new file mode 100644
index 00000000..a59a9e69
--- /dev/null
+++ b/debian/patches/mbstate-D150322.diff
@@ -0,0 +1,69 @@
+diff --git a/libcxx/include/__mbstate_t.h b/libcxx/include/__mbstate_t.h
+--- a/libcxx/include/__mbstate_t.h
++++ b/libcxx/include/__mbstate_t.h
+@@ -27,24 +27,24 @@
+ // This does not define std::mbstate_t -- this only brings in the declaration
+ // in the global namespace.
+ 
++#if __has_include(<bits/types/mbstate_t.h>)
++#  include <bits/types/mbstate_t.h> // works on most Unixes
++#elif __has_include(<sys/_types/_mbstate_t.h>)
++#  include <sys/_types/_mbstate_t.h> // works on Darwin
++#elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>)
++// Some older versions of <wchar.h> do not define this for clang, so we do it ourselves.
+ // We define this here to support older versions of glibc <wchar.h> that do
+ // not define this for clang. This is also set in libc++'s <wchar.h> header,
+ // and we need to do so here too to avoid a different function signature given
+ // a different include order.
+-#ifdef __cplusplus
+-#  define __CORRECT_ISO_CPP_WCHAR_H_PROTO
+-#endif
+-
+-#if __has_include(<bits/types/mbstate_t.h>)
+-#   include <bits/types/mbstate_t.h> // works on most Unixes
+-#elif __has_include(<sys/_types/_mbstate_t.h>)
+-#   include <sys/_types/_mbstate_t.h> // works on Darwin
+-#elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>)
+-#   include_next <wchar.h> // fall back to the C standard provider of mbstate_t
++#  ifdef __cplusplus
++#    define __CORRECT_ISO_CPP_WCHAR_H_PROTO
++#  endif
++#  include_next <wchar.h> // fall back to the C standard provider of mbstate_t
+ #elif __has_include_next(<uchar.h>)
+-#   include_next <uchar.h> // <uchar.h> is also required to make mbstate_t visible
++#  include_next <uchar.h> // <uchar.h> is also required to make mbstate_t visible
+ #else
+-#   error "We don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
++#  error "We don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
+ #endif
+ 
+ #endif // _LIBCPP___MBSTATE_T_H
+diff --git a/libcxx/include/wchar.h b/libcxx/include/wchar.h
+--- a/libcxx/include/wchar.h
++++ b/libcxx/include/wchar.h
+@@ -116,17 +116,16 @@
+ #  pragma GCC system_header
+ #endif
+ 
++#if __has_include_next(<wchar.h>)
+ // We define this here to support older versions of glibc <wchar.h> that do
+ // not define this for clang.
+-#ifdef __cplusplus
+-#define __CORRECT_ISO_CPP_WCHAR_H_PROTO
+-#endif
+-
+-#  if __has_include_next(<wchar.h>)
+-#    include_next <wchar.h>
+-#  else
+-#    include <__mbstate_t.h> // make sure we have mbstate_t regardless of the existence of <wchar.h>
++#  ifdef __cplusplus
++#    define __CORRECT_ISO_CPP_WCHAR_H_PROTO
+ #  endif
++#  include_next <wchar.h>
++#else
++#  include <__mbstate_t.h> // make sure we have mbstate_t regardless of the existence of <wchar.h>
++#endif
+ 
+ // Determine whether we have const-correct overloads for wcschr and friends.
+ #if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)
+
diff --git a/debian/patches/mbstate-revert-issue-62523.patch b/debian/patches/mbstate-revert-issue-62523.patch
deleted file mode 100644
index 080961ec..00000000
--- a/debian/patches/mbstate-revert-issue-62523.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-commit a595b931f1f91897317a4257df313bddfeb029a6
-Author: Ian Anderson <iana@apple.com>
-Date:   Mon Apr 17 09:38:38 2023 -0700
-
-    [libc++] cuchar redeclares ::mbstate_t when it's in its own clang module
-    
-    When cuchar is compiled independently on platforms that don't have <uchar.h>, it doesn't get a declaration of mbstate_t, and so makes an empty declaration for ::mbstate_t. That conflicts with the declarations in __mbstate_t.h and cwchar since both of those headers do get mbstate_t before making ::mbstate_t.
-    
-    Change `__mbstate_t.h` to just get the underlying declaration for mbstate_t and not make a declaration for ::mbstate_t. Include __mbstate_t.h in uchar.h and wchar.h when their next headers aren't available so that at least mbstate_t gets defined.
-    
-    Add __std_mbstate_t.h to declare ::mbstate_t for headers that need that when cuchar or cwchar aren't available (because either _LIBCPP_HAS_NO_WIDE_CHARACTERS or _LIBCPP_CXX03_LANG).
-    
-    Reviewed By: ldionne, Mordante, #libc, philnik
-    
-    Differential Revision: https://reviews.llvm.org/D148542
-
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/CMakeLists.txt
-@@ -615,7 +615,6 @@ set(files
-   __ranges/views.h
-   __ranges/zip_view.h
-   __split_buffer
--  __std_mbstate_t.h
-   __string/char_traits.h
-   __string/constexpr_c_functions.h
-   __string/extern_template_lists.h
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__locale
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/__locale
-+++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__locale
-@@ -25,8 +25,6 @@
- 
- #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
- #  include <cwchar>
--#else
--#  include <__std_mbstate_t.h>
- #endif
- 
- #if defined(_LIBCPP_MSVCRT_LIKE)
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__mbstate_t.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/__mbstate_t.h
-+++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__mbstate_t.h
-@@ -16,27 +16,29 @@
- #  pragma GCC system_header
- #endif
- 
--// The goal of this header is to provide mbstate_t without requiring all of
--// <uchar.h> or <wchar.h>. It's also used by the libc++ versions of <uchar.h>
--// and <wchar.h> to get mbstate_t when the C library doesn't provide <uchar.h>
--// or <wchar.h>, hence the #include_next of those headers instead of #include.
--// (e.g. if <wchar.h> isn't present in the C library, the libc++ <wchar.h>
--// will include this header. This header needs to not turn around and cyclically
--// include <wchar.h>, but fall through to <uchar.h>.)
-+// TODO(ldionne):
-+// The goal of this header is to provide mbstate_t without having to pull in
-+// <wchar.h> or <uchar.h>. This is necessary because we need that type even
-+// when we don't have (or try to provide) support for wchar_t, because several
-+// types like std::fpos are defined in terms of mbstate_t.
- //
--// This does not define std::mbstate_t -- this only brings in the declaration
--// in the global namespace.
-+// This is a gruesome hack, but I don't know how to make it cleaner for
-+// the time being.
- 
--#if __has_include(<bits/types/mbstate_t.h>)
-+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
-+#   include <wchar.h> // for mbstate_t
-+#elif __has_include(<bits/types/mbstate_t.h>)
- #   include <bits/types/mbstate_t.h> // works on most Unixes
- #elif __has_include(<sys/_types/_mbstate_t.h>)
- #   include <sys/_types/_mbstate_t.h> // works on Darwin
--#elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>)
--#   include_next <wchar.h> // fall back to the C standard provider of mbstate_t
--#elif __has_include_next(<uchar.h>)
--#   include_next <uchar.h> // <uchar.h> is also required to make mbstate_t visible
- #else
--#   error "We don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
-+#   error "The library was configured without support for wide-characters, but we don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
- #endif
- 
-+_LIBCPP_BEGIN_NAMESPACE_STD
-+
-+using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
-+
-+_LIBCPP_END_NAMESPACE_STD
-+
- #endif // _LIBCPP___MBSTATE_T_H
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/__std_mbstate_t.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/__std_mbstate_t.h
-+++ /dev/null
-@@ -1,29 +0,0 @@
--// -*- C++ -*-
--//===----------------------------------------------------------------------===//
--//
--// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
--// See https://llvm.org/LICENSE.txt for license information.
--// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
--//
--//===----------------------------------------------------------------------===//
--
--#ifndef _LIBCPP___STD_MBSTATE_T_H
--#define _LIBCPP___STD_MBSTATE_T_H
--
--#include <__config>
--#include <__mbstate_t.h>
--
--#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
--#  pragma GCC system_header
--#endif
--
--// The goal of this header is to provide std::mbstate_t without requiring all
--// of <cuchar> or <cwchar>.
--
--_LIBCPP_BEGIN_NAMESPACE_STD
--
--using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
--
--_LIBCPP_END_NAMESPACE_STD
--
--#endif // _LIBCPP___STD_MBSTATE_T_H
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/iosfwd
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/iosfwd
-+++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/iosfwd
-@@ -103,7 +103,7 @@ using u32streampos = fpos<char_traits<ch
- #include <__fwd/sstream.h>
- #include <__fwd/streambuf.h>
- #include <__fwd/string.h>
--#include <__std_mbstate_t.h>
-+#include <__mbstate_t.h>
- #include <version>
- 
- #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/module.modulemap.in
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/module.modulemap.in
-+++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/module.modulemap.in
-@@ -1743,7 +1743,6 @@ module std [system] {
-   module __mbstate_t         { private header "__mbstate_t.h"       export * }
-   module __node_handle       { private header "__node_handle"       export * }
-   module __split_buffer      { private header "__split_buffer"      export * }
--  module __std_mbstate_t     { private header "__std_mbstate_t.h"   export * }
-   module __threading_support {         header "__threading_support" export * }
-   module __tree              {         header "__tree"              export * }
-   module __undef_macros      {         header "__undef_macros"      export * }
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/uchar.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/uchar.h
-+++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/uchar.h
-@@ -42,12 +42,10 @@ size_t c32rtomb(char* s, char32_t c32, m
- 
- // Some platforms don't implement <uchar.h> and we don't want to give a hard
- // error on those platforms. When the platform doesn't provide <uchar.h>, at
--// least include <stddef.h> so we get the declaration for size_t, and try to
--// get the declaration of mbstate_t too.
-+// least include <stddef.h> so we get the declaration for size_t.
- #if __has_include_next(<uchar.h>)
- # include_next <uchar.h>
- #else
--# include <__mbstate_t.h>
- # include <stddef.h>
- #endif
- 
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/wchar.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/include/wchar.h
-+++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/include/wchar.h
-@@ -122,8 +122,6 @@ size_t wcsrtombs(char* restrict dst, con
- 
- #  if __has_include_next(<wchar.h>)
- #    include_next <wchar.h>
--#  else
--#    include <__mbstate_t.h> // make sure we have mbstate_t regardless of the existence of <wchar.h>
- #  endif
- 
- // Determine whether we have const-correct overloads for wcschr and friends.
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/test/libcxx/private_headers.verify.cpp
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/test/libcxx/private_headers.verify.cpp
-+++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/test/libcxx/private_headers.verify.cpp
-@@ -614,7 +614,6 @@ END-SCRIPT
- #include <__ranges/views.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/views.h'}}
- #include <__ranges/zip_view.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/zip_view.h'}}
- #include <__split_buffer> // expected-error@*:* {{use of private header from outside its module: '__split_buffer'}}
--#include <__std_mbstate_t.h> // expected-error@*:* {{use of private header from outside its module: '__std_mbstate_t.h'}}
- #include <__string/char_traits.h> // expected-error@*:* {{use of private header from outside its module: '__string/char_traits.h'}}
- #include <__string/constexpr_c_functions.h> // expected-error@*:* {{use of private header from outside its module: '__string/constexpr_c_functions.h'}}
- #include <__string/extern_template_lists.h> // expected-error@*:* {{use of private header from outside its module: '__string/extern_template_lists.h'}}
-Index: llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/utils/generate_iwyu_mapping.py
-===================================================================
---- llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe.orig/libcxx/utils/generate_iwyu_mapping.py
-+++ llvm-toolchain-snapshot_17~++20230507075322+70218f6f83fe/libcxx/utils/generate_iwyu_mapping.py
-@@ -56,12 +56,11 @@ def generate_map(include):
-         elif i == '__pstl_memory': continue
-         elif i == '__pstl_numeric': continue
-         elif i == '__split_buffer': public = ['deque', 'vector']
--        elif i == '__std_mbstate_t.h': continue
-         elif i == '__threading_support': public = ['atomic', 'mutex', 'semaphore', 'thread']
-         elif i == '__tree': public = ['map', 'set']
-         elif i == '__undef_macros': continue
-         elif i == '__verbose_abort': continue
--        else: panic(i)
-+        else: panic()
- 
-         for p in public:
-             result.append(f'{generate(f"<{i}>", p)},')
diff --git a/debian/patches/series b/debian/patches/series
index 3cb1d87a..86170152 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-#mbstate-revert-issue-62523.patch
+mbstate-D150322.diff

From 76097e773d04f87571e8d9adcc6eed1601a077d3 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 12 May 2023 09:11:33 +0200
Subject: [PATCH 050/349] reapply the revert

---
 debian/patches/mbstate-D150322.diff           |  69 ------
 .../patches/mbstate-revert-issue-62523.patch  | 211 ++++++++++++++++++
 debian/patches/series                         |   2 +-
 3 files changed, 212 insertions(+), 70 deletions(-)
 delete mode 100644 debian/patches/mbstate-D150322.diff
 create mode 100644 debian/patches/mbstate-revert-issue-62523.patch

diff --git a/debian/patches/mbstate-D150322.diff b/debian/patches/mbstate-D150322.diff
deleted file mode 100644
index a59a9e69..00000000
--- a/debian/patches/mbstate-D150322.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/libcxx/include/__mbstate_t.h b/libcxx/include/__mbstate_t.h
---- a/libcxx/include/__mbstate_t.h
-+++ b/libcxx/include/__mbstate_t.h
-@@ -27,24 +27,24 @@
- // This does not define std::mbstate_t -- this only brings in the declaration
- // in the global namespace.
- 
-+#if __has_include(<bits/types/mbstate_t.h>)
-+#  include <bits/types/mbstate_t.h> // works on most Unixes
-+#elif __has_include(<sys/_types/_mbstate_t.h>)
-+#  include <sys/_types/_mbstate_t.h> // works on Darwin
-+#elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>)
-+// Some older versions of <wchar.h> do not define this for clang, so we do it ourselves.
- // We define this here to support older versions of glibc <wchar.h> that do
- // not define this for clang. This is also set in libc++'s <wchar.h> header,
- // and we need to do so here too to avoid a different function signature given
- // a different include order.
--#ifdef __cplusplus
--#  define __CORRECT_ISO_CPP_WCHAR_H_PROTO
--#endif
--
--#if __has_include(<bits/types/mbstate_t.h>)
--#   include <bits/types/mbstate_t.h> // works on most Unixes
--#elif __has_include(<sys/_types/_mbstate_t.h>)
--#   include <sys/_types/_mbstate_t.h> // works on Darwin
--#elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>)
--#   include_next <wchar.h> // fall back to the C standard provider of mbstate_t
-+#  ifdef __cplusplus
-+#    define __CORRECT_ISO_CPP_WCHAR_H_PROTO
-+#  endif
-+#  include_next <wchar.h> // fall back to the C standard provider of mbstate_t
- #elif __has_include_next(<uchar.h>)
--#   include_next <uchar.h> // <uchar.h> is also required to make mbstate_t visible
-+#  include_next <uchar.h> // <uchar.h> is also required to make mbstate_t visible
- #else
--#   error "We don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
-+#  error "We don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
- #endif
- 
- #endif // _LIBCPP___MBSTATE_T_H
-diff --git a/libcxx/include/wchar.h b/libcxx/include/wchar.h
---- a/libcxx/include/wchar.h
-+++ b/libcxx/include/wchar.h
-@@ -116,17 +116,16 @@
- #  pragma GCC system_header
- #endif
- 
-+#if __has_include_next(<wchar.h>)
- // We define this here to support older versions of glibc <wchar.h> that do
- // not define this for clang.
--#ifdef __cplusplus
--#define __CORRECT_ISO_CPP_WCHAR_H_PROTO
--#endif
--
--#  if __has_include_next(<wchar.h>)
--#    include_next <wchar.h>
--#  else
--#    include <__mbstate_t.h> // make sure we have mbstate_t regardless of the existence of <wchar.h>
-+#  ifdef __cplusplus
-+#    define __CORRECT_ISO_CPP_WCHAR_H_PROTO
- #  endif
-+#  include_next <wchar.h>
-+#else
-+#  include <__mbstate_t.h> // make sure we have mbstate_t regardless of the existence of <wchar.h>
-+#endif
- 
- // Determine whether we have const-correct overloads for wcschr and friends.
- #if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)
-
diff --git a/debian/patches/mbstate-revert-issue-62523.patch b/debian/patches/mbstate-revert-issue-62523.patch
new file mode 100644
index 00000000..c6290f8a
--- /dev/null
+++ b/debian/patches/mbstate-revert-issue-62523.patch
@@ -0,0 +1,211 @@
+commit a595b931f1f91897317a4257df313bddfeb029a6
+Author: Ian Anderson <iana@apple.com>
+Date:   Mon Apr 17 09:38:38 2023 -0700
+
+    [libc++] cuchar redeclares ::mbstate_t when it's in its own clang module
+    
+    When cuchar is compiled independently on platforms that don't have <uchar.h>, it doesn't get a declaration of mbstate_t, and so makes an empty declaration for ::mbstate_t. That conflicts with the declarations in __mbstate_t.h and cwchar since both of those headers do get mbstate_t before making ::mbstate_t.
+    
+    Change `__mbstate_t.h` to just get the underlying declaration for mbstate_t and not make a declaration for ::mbstate_t. Include __mbstate_t.h in uchar.h and wchar.h when their next headers aren't available so that at least mbstate_t gets defined.
+    
+    Add __std_mbstate_t.h to declare ::mbstate_t for headers that need that when cuchar or cwchar aren't available (because either _LIBCPP_HAS_NO_WIDE_CHARACTERS or _LIBCPP_CXX03_LANG).
+    
+    Reviewed By: ldionne, Mordante, #libc, philnik
+    
+    Differential Revision: https://reviews.llvm.org/D148542
+
+diff --git b/libcxx/include/CMakeLists.txt a/libcxx/include/CMakeLists.txt
+index 356af6db8f6c..fa64cec327e6 100644
+--- b/libcxx/include/CMakeLists.txt
++++ a/libcxx/include/CMakeLists.txt
+@@ -614,7 +614,6 @@ set(files
+   __ranges/views.h
+   __ranges/zip_view.h
+   __split_buffer
+-  __std_mbstate_t.h
+   __string/char_traits.h
+   __string/constexpr_c_functions.h
+   __string/extern_template_lists.h
+diff --git b/libcxx/include/__locale a/libcxx/include/__locale
+index a812427acba4..994613083cdf 100644
+--- b/libcxx/include/__locale
++++ a/libcxx/include/__locale
+@@ -25,8 +25,6 @@
+ 
+ #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+ #  include <cwchar>
+-#else
+-#  include <__std_mbstate_t.h>
+ #endif
+ 
+ #if defined(_LIBCPP_MSVCRT_LIKE)
+diff --git b/libcxx/include/__mbstate_t.h a/libcxx/include/__mbstate_t.h
+index d793787fa0cd..487a6d092c71 100644
+--- b/libcxx/include/__mbstate_t.h
++++ a/libcxx/include/__mbstate_t.h
+@@ -16,27 +16,29 @@
+ #  pragma GCC system_header
+ #endif
+ 
+-// The goal of this header is to provide mbstate_t without requiring all of
+-// <uchar.h> or <wchar.h>. It's also used by the libc++ versions of <uchar.h>
+-// and <wchar.h> to get mbstate_t when the C library doesn't provide <uchar.h>
+-// or <wchar.h>, hence the #include_next of those headers instead of #include.
+-// (e.g. if <wchar.h> isn't present in the C library, the libc++ <wchar.h>
+-// will include this header. This header needs to not turn around and cyclically
+-// include <wchar.h>, but fall through to <uchar.h>.)
++// TODO(ldionne):
++// The goal of this header is to provide mbstate_t without having to pull in
++// <wchar.h> or <uchar.h>. This is necessary because we need that type even
++// when we don't have (or try to provide) support for wchar_t, because several
++// types like std::fpos are defined in terms of mbstate_t.
+ //
+-// This does not define std::mbstate_t -- this only brings in the declaration
+-// in the global namespace.
++// This is a gruesome hack, but I don't know how to make it cleaner for
++// the time being.
+ 
+-#if __has_include(<bits/types/mbstate_t.h>)
++#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
++#   include <wchar.h> // for mbstate_t
++#elif __has_include(<bits/types/mbstate_t.h>)
+ #   include <bits/types/mbstate_t.h> // works on most Unixes
+ #elif __has_include(<sys/_types/_mbstate_t.h>)
+ #   include <sys/_types/_mbstate_t.h> // works on Darwin
+-#elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>)
+-#   include_next <wchar.h> // fall back to the C standard provider of mbstate_t
+-#elif __has_include_next(<uchar.h>)
+-#   include_next <uchar.h> // <uchar.h> is also required to make mbstate_t visible
+ #else
+-#   error "We don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
++#   error "The library was configured without support for wide-characters, but we don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
+ #endif
+ 
++_LIBCPP_BEGIN_NAMESPACE_STD
++
++using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
++
++_LIBCPP_END_NAMESPACE_STD
++
+ #endif // _LIBCPP___MBSTATE_T_H
+diff --git b/libcxx/include/__std_mbstate_t.h a/libcxx/include/__std_mbstate_t.h
+deleted file mode 100644
+index e79cc789fddf..000000000000
+--- b/libcxx/include/__std_mbstate_t.h
++++ /dev/null
+@@ -1,29 +0,0 @@
+-// -*- C++ -*-
+-//===----------------------------------------------------------------------===//
+-//
+-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+-// See https://llvm.org/LICENSE.txt for license information.
+-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+-//
+-//===----------------------------------------------------------------------===//
+-
+-#ifndef _LIBCPP___STD_MBSTATE_T_H
+-#define _LIBCPP___STD_MBSTATE_T_H
+-
+-#include <__config>
+-#include <__mbstate_t.h>
+-
+-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+-#  pragma GCC system_header
+-#endif
+-
+-// The goal of this header is to provide std::mbstate_t without requiring all
+-// of <cuchar> or <cwchar>.
+-
+-_LIBCPP_BEGIN_NAMESPACE_STD
+-
+-using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
+-
+-_LIBCPP_END_NAMESPACE_STD
+-
+-#endif // _LIBCPP___STD_MBSTATE_T_H
+diff --git b/libcxx/include/iosfwd a/libcxx/include/iosfwd
+index e3cd9faa70b7..0af7df30d8fd 100644
+--- b/libcxx/include/iosfwd
++++ a/libcxx/include/iosfwd
+@@ -103,7 +103,7 @@ using u32streampos = fpos<char_traits<char32_t>::state_type>;
+ #include <__fwd/sstream.h>
+ #include <__fwd/streambuf.h>
+ #include <__fwd/string.h>
+-#include <__std_mbstate_t.h>
++#include <__mbstate_t.h>
+ #include <version>
+ 
+ #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+diff --git b/libcxx/include/module.modulemap.in a/libcxx/include/module.modulemap.in
+index 99907787132b..01f763d764e6 100644
+--- b/libcxx/include/module.modulemap.in
++++ a/libcxx/include/module.modulemap.in
+@@ -1735,7 +1735,6 @@ module std [system] {
+   module __mbstate_t         { private header "__mbstate_t.h"       export * }
+   module __node_handle       { private header "__node_handle"       export * }
+   module __split_buffer      { private header "__split_buffer"      export * }
+-  module __std_mbstate_t     { private header "__std_mbstate_t.h"   export * }
+   module __threading_support {         header "__threading_support" export * }
+   module __tree              {         header "__tree"              export * }
+   module __undef_macros      {         header "__undef_macros"      export * }
+diff --git b/libcxx/include/uchar.h a/libcxx/include/uchar.h
+index 546113f7eab4..3a51bb7a9f61 100644
+--- b/libcxx/include/uchar.h
++++ a/libcxx/include/uchar.h
+@@ -42,12 +42,10 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps);
+ 
+ // Some platforms don't implement <uchar.h> and we don't want to give a hard
+ // error on those platforms. When the platform doesn't provide <uchar.h>, at
+-// least include <stddef.h> so we get the declaration for size_t, and try to
+-// get the declaration of mbstate_t too.
++// least include <stddef.h> so we get the declaration for size_t.
+ #if __has_include_next(<uchar.h>)
+ # include_next <uchar.h>
+ #else
+-# include <__mbstate_t.h>
+ # include <stddef.h>
+ #endif
+ 
+diff --git b/libcxx/include/wchar.h a/libcxx/include/wchar.h
+index db624cea2bee..c684508dc2cc 100644
+--- b/libcxx/include/wchar.h
++++ a/libcxx/include/wchar.h
+@@ -122,8 +122,6 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
+ 
+ #  if __has_include_next(<wchar.h>)
+ #    include_next <wchar.h>
+-#  else
+-#    include <__mbstate_t.h> // make sure we have mbstate_t regardless of the existence of <wchar.h>
+ #  endif
+ 
+ // Determine whether we have const-correct overloads for wcschr and friends.
+diff --git b/libcxx/test/libcxx/private_headers.verify.cpp a/libcxx/test/libcxx/private_headers.verify.cpp
+index 0720e1f72a77..48b9a7f8c574 100644
+--- b/libcxx/test/libcxx/private_headers.verify.cpp
++++ a/libcxx/test/libcxx/private_headers.verify.cpp
+@@ -614,7 +614,6 @@ END-SCRIPT
+ #include <__ranges/views.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/views.h'}}
+ #include <__ranges/zip_view.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/zip_view.h'}}
+ #include <__split_buffer> // expected-error@*:* {{use of private header from outside its module: '__split_buffer'}}
+-#include <__std_mbstate_t.h> // expected-error@*:* {{use of private header from outside its module: '__std_mbstate_t.h'}}
+ #include <__string/char_traits.h> // expected-error@*:* {{use of private header from outside its module: '__string/char_traits.h'}}
+ #include <__string/constexpr_c_functions.h> // expected-error@*:* {{use of private header from outside its module: '__string/constexpr_c_functions.h'}}
+ #include <__string/extern_template_lists.h> // expected-error@*:* {{use of private header from outside its module: '__string/extern_template_lists.h'}}
+diff --git b/libcxx/utils/generate_iwyu_mapping.py a/libcxx/utils/generate_iwyu_mapping.py
+index f8377a976f08..cb27d4677395 100644
+--- b/libcxx/utils/generate_iwyu_mapping.py
++++ a/libcxx/utils/generate_iwyu_mapping.py
+@@ -56,12 +56,11 @@ def generate_map(include):
+         elif i == '__pstl_memory': continue
+         elif i == '__pstl_numeric': continue
+         elif i == '__split_buffer': public = ['deque', 'vector']
+-        elif i == '__std_mbstate_t.h': continue
+         elif i == '__threading_support': public = ['atomic', 'mutex', 'semaphore', 'thread']
+         elif i == '__tree': public = ['map', 'set']
+         elif i == '__undef_macros': continue
+         elif i == '__verbose_abort': continue
+-        else: panic(i)
++        else: panic()
+ 
+         for p in public:
+             result.append(f'{generate(f"<{i}>", p)},')
diff --git a/debian/patches/series b/debian/patches/series
index 86170152..0878cd13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-mbstate-D150322.diff
+mbstate-revert-issue-62523.patch

From bc6b5397de18523fd2dd4b203c124d5f2e587493 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 12 May 2023 09:42:14 +0200
Subject: [PATCH 051/349] revert another patch for mbstate

---
 .../mbstate-revert-issue-62523-2.patch        | 108 ++++++++++++++++++
 .../patches/mbstate-revert-issue-62523.patch  |  93 ++++++++-------
 debian/patches/series                         |   1 +
 3 files changed, 155 insertions(+), 47 deletions(-)
 create mode 100644 debian/patches/mbstate-revert-issue-62523-2.patch

diff --git a/debian/patches/mbstate-revert-issue-62523-2.patch b/debian/patches/mbstate-revert-issue-62523-2.patch
new file mode 100644
index 00000000..336bdea5
--- /dev/null
+++ b/debian/patches/mbstate-revert-issue-62523-2.patch
@@ -0,0 +1,108 @@
+commit 0ec57bf7b18e8918dd8ced007a88467b798677c6
+Author: Jordan Rupprecht <rupprecht@google.com>
+Date:   Wed May 10 15:43:37 2023 -0700
+
+    [libc++] Consistently enable __CORRECT_ISO_CPP_WCHAR_H_PROTO in mbstate.
+    
+    In libc++'s `wchar.h`, before we forward to the system `wchar.h`, we set `__CORRECT_ISO_CPP_WCHAR_H_PROTO` to ensure it defines the correct signature (e.g. `extern "C++" const wchar_t *wmemchr` and not `extern wchar_t *wmemchr`). After D148542, there are cases where we include the system `wchar.h` from within `__mbstate_t.h` without setting that, and so we get a function type mismatch if we transitively include `wchar.h` through multiple headers in a modules-enabled build. Consistently setting it here resolves those build errors.
+    
+    Alternative 1: we could put this in `__config` instead. I chose to put it here for a more limited scope.
+    
+    Alternative 2: we could patch `wchar.h` itself to work correctly and remove references `__CORRECT_ISO_CPP_WCHAR_H_PROTO` from libc++ entirely. It does already set it, but with an additional condition that it is being built by GCC >= 4.4. Clang does pretend to be GCC via `__GNUC__` etc. which can be controlled via `-fgnuc-version` command line flags, but that might have other consequences.
+    
+    Reviewed By: ldionne, #libc, MaskRay
+    
+    Differential Revision: https://reviews.llvm.org/D150015
+
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__mbstate_t.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/__mbstate_t.h
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__mbstate_t.h
+@@ -27,14 +27,6 @@
+ // This does not define std::mbstate_t -- this only brings in the declaration
+ // in the global namespace.
+ 
+-// We define this here to support older versions of glibc <wchar.h> that do
+-// not define this for clang. This is also set in libc++'s <wchar.h> header,
+-// and we need to do so here too to avoid a different function signature given
+-// a different include order.
+-#ifdef __cplusplus
+-#  define __CORRECT_ISO_CPP_WCHAR_H_PROTO
+-#endif
+-
+ #if __has_include(<bits/types/mbstate_t.h>)
+ #   include <bits/types/mbstate_t.h> // works on most Unixes
+ #elif __has_include(<sys/_types/_mbstate_t.h>)
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/wchar.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/wchar.h
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/wchar.h
+@@ -116,8 +116,6 @@ size_t wcsrtombs(char* restrict dst, con
+ #  pragma GCC system_header
+ #endif
+ 
+-// We define this here to support older versions of glibc <wchar.h> that do
+-// not define this for clang.
+ #ifdef __cplusplus
+ #define __CORRECT_ISO_CPP_WCHAR_H_PROTO
+ #endif
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/test/std/strings/c.strings/cwchar_include_order1.compile.verify.cpp
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/test/std/strings/c.strings/cwchar_include_order1.compile.verify.cpp
++++ /dev/null
+@@ -1,25 +0,0 @@
+-//===----------------------------------------------------------------------===//
+-//
+-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+-// See https://llvm.org/LICENSE.txt for license information.
+-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+-//
+-//===----------------------------------------------------------------------===//
+-
+-// <cwchar>
+-
+-// XFAIL: no-wide-characters
+-
+-// Tests that include ordering does not affect the definition of wcsstr.
+-// See: https://llvm.org/PR62638
+-
+-// clang-format off
+-#include <cwchar>
+-#include <iosfwd>
+-// clang-format on
+-
+-void func() {
+-  wchar_t* v1;
+-  const wchar_t* cv2 = L"/";
+-  v1 = wcsstr(cv2, L"/"); // expected-error {{assigning to 'wchar_t *' from 'const wchar_t *' discards qualifiers}}
+-}
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/test/std/strings/c.strings/cwchar_include_order2.compile.verify.cpp
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/test/std/strings/c.strings/cwchar_include_order2.compile.verify.cpp
++++ /dev/null
+@@ -1,25 +0,0 @@
+-//===----------------------------------------------------------------------===//
+-//
+-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+-// See https://llvm.org/LICENSE.txt for license information.
+-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+-//
+-//===----------------------------------------------------------------------===//
+-
+-// <cwchar>
+-
+-// XFAIL: no-wide-characters
+-
+-// Tests that include ordering does not affect the definition of wcsstr.
+-// See: https://llvm.org/PR62638
+-
+-// clang-format off
+-#include <iosfwd>
+-#include <cwchar>
+-// clang-format on
+-
+-void func() {
+-  wchar_t* v1;
+-  const wchar_t* cv2 = L"/";
+-  v1 = wcsstr(cv2, L"/"); // expected-error {{assigning to 'wchar_t *' from 'const wchar_t *' discards qualifiers}}
+-}
diff --git a/debian/patches/mbstate-revert-issue-62523.patch b/debian/patches/mbstate-revert-issue-62523.patch
index c6290f8a..96252d0b 100644
--- a/debian/patches/mbstate-revert-issue-62523.patch
+++ b/debian/patches/mbstate-revert-issue-62523.patch
@@ -14,11 +14,11 @@ Date:   Mon Apr 17 09:38:38 2023 -0700
     
     Differential Revision: https://reviews.llvm.org/D148542
 
-diff --git b/libcxx/include/CMakeLists.txt a/libcxx/include/CMakeLists.txt
-index 356af6db8f6c..fa64cec327e6 100644
---- b/libcxx/include/CMakeLists.txt
-+++ a/libcxx/include/CMakeLists.txt
-@@ -614,7 +614,6 @@ set(files
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/CMakeLists.txt
+@@ -622,7 +622,6 @@ set(files
    __ranges/views.h
    __ranges/zip_view.h
    __split_buffer
@@ -26,11 +26,11 @@ index 356af6db8f6c..fa64cec327e6 100644
    __string/char_traits.h
    __string/constexpr_c_functions.h
    __string/extern_template_lists.h
-diff --git b/libcxx/include/__locale a/libcxx/include/__locale
-index a812427acba4..994613083cdf 100644
---- b/libcxx/include/__locale
-+++ a/libcxx/include/__locale
-@@ -25,8 +25,6 @@
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__locale
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/__locale
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__locale
+@@ -26,8 +26,6 @@
  
  #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
  #  include <cwchar>
@@ -39,10 +39,10 @@ index a812427acba4..994613083cdf 100644
  #endif
  
  #if defined(_LIBCPP_MSVCRT_LIKE)
-diff --git b/libcxx/include/__mbstate_t.h a/libcxx/include/__mbstate_t.h
-index d793787fa0cd..487a6d092c71 100644
---- b/libcxx/include/__mbstate_t.h
-+++ a/libcxx/include/__mbstate_t.h
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__mbstate_t.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/__mbstate_t.h
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__mbstate_t.h
 @@ -16,27 +16,29 @@
  #  pragma GCC system_header
  #endif
@@ -88,10 +88,9 @@ index d793787fa0cd..487a6d092c71 100644
 +_LIBCPP_END_NAMESPACE_STD
 +
  #endif // _LIBCPP___MBSTATE_T_H
-diff --git b/libcxx/include/__std_mbstate_t.h a/libcxx/include/__std_mbstate_t.h
-deleted file mode 100644
-index e79cc789fddf..000000000000
---- b/libcxx/include/__std_mbstate_t.h
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__std_mbstate_t.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/__std_mbstate_t.h
 +++ /dev/null
 @@ -1,29 +0,0 @@
 -// -*- C++ -*-
@@ -123,11 +122,11 @@ index e79cc789fddf..000000000000
 -_LIBCPP_END_NAMESPACE_STD
 -
 -#endif // _LIBCPP___STD_MBSTATE_T_H
-diff --git b/libcxx/include/iosfwd a/libcxx/include/iosfwd
-index e3cd9faa70b7..0af7df30d8fd 100644
---- b/libcxx/include/iosfwd
-+++ a/libcxx/include/iosfwd
-@@ -103,7 +103,7 @@ using u32streampos = fpos<char_traits<char32_t>::state_type>;
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/iosfwd
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/iosfwd
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/iosfwd
+@@ -103,7 +103,7 @@ using u32streampos = fpos<char_traits<ch
  #include <__fwd/sstream.h>
  #include <__fwd/streambuf.h>
  #include <__fwd/string.h>
@@ -136,11 +135,11 @@ index e3cd9faa70b7..0af7df30d8fd 100644
  #include <version>
  
  #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-diff --git b/libcxx/include/module.modulemap.in a/libcxx/include/module.modulemap.in
-index 99907787132b..01f763d764e6 100644
---- b/libcxx/include/module.modulemap.in
-+++ a/libcxx/include/module.modulemap.in
-@@ -1735,7 +1735,6 @@ module std [system] {
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/module.modulemap.in
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/module.modulemap.in
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/module.modulemap.in
+@@ -1755,7 +1755,6 @@ module std [system] {
    module __mbstate_t         { private header "__mbstate_t.h"       export * }
    module __node_handle       { private header "__node_handle"       export * }
    module __split_buffer      { private header "__split_buffer"      export * }
@@ -148,11 +147,11 @@ index 99907787132b..01f763d764e6 100644
    module __threading_support {         header "__threading_support" export * }
    module __tree              {         header "__tree"              export * }
    module __undef_macros      {         header "__undef_macros"      export * }
-diff --git b/libcxx/include/uchar.h a/libcxx/include/uchar.h
-index 546113f7eab4..3a51bb7a9f61 100644
---- b/libcxx/include/uchar.h
-+++ a/libcxx/include/uchar.h
-@@ -42,12 +42,10 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps);
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/uchar.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/uchar.h
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/uchar.h
+@@ -42,12 +42,10 @@ size_t c32rtomb(char* s, char32_t c32, m
  
  // Some platforms don't implement <uchar.h> and we don't want to give a hard
  // error on those platforms. When the platform doesn't provide <uchar.h>, at
@@ -166,11 +165,11 @@ index 546113f7eab4..3a51bb7a9f61 100644
  # include <stddef.h>
  #endif
  
-diff --git b/libcxx/include/wchar.h a/libcxx/include/wchar.h
-index db624cea2bee..c684508dc2cc 100644
---- b/libcxx/include/wchar.h
-+++ a/libcxx/include/wchar.h
-@@ -122,8 +122,6 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/wchar.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/wchar.h
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/wchar.h
+@@ -122,8 +122,6 @@ size_t wcsrtombs(char* restrict dst, con
  
  #  if __has_include_next(<wchar.h>)
  #    include_next <wchar.h>
@@ -179,11 +178,11 @@ index db624cea2bee..c684508dc2cc 100644
  #  endif
  
  // Determine whether we have const-correct overloads for wcschr and friends.
-diff --git b/libcxx/test/libcxx/private_headers.verify.cpp a/libcxx/test/libcxx/private_headers.verify.cpp
-index 0720e1f72a77..48b9a7f8c574 100644
---- b/libcxx/test/libcxx/private_headers.verify.cpp
-+++ a/libcxx/test/libcxx/private_headers.verify.cpp
-@@ -614,7 +614,6 @@ END-SCRIPT
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/test/libcxx/private_headers.verify.cpp
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/test/libcxx/private_headers.verify.cpp
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/test/libcxx/private_headers.verify.cpp
+@@ -620,7 +620,6 @@ END-SCRIPT
  #include <__ranges/views.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/views.h'}}
  #include <__ranges/zip_view.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/zip_view.h'}}
  #include <__split_buffer> // expected-error@*:* {{use of private header from outside its module: '__split_buffer'}}
@@ -191,10 +190,10 @@ index 0720e1f72a77..48b9a7f8c574 100644
  #include <__string/char_traits.h> // expected-error@*:* {{use of private header from outside its module: '__string/char_traits.h'}}
  #include <__string/constexpr_c_functions.h> // expected-error@*:* {{use of private header from outside its module: '__string/constexpr_c_functions.h'}}
  #include <__string/extern_template_lists.h> // expected-error@*:* {{use of private header from outside its module: '__string/extern_template_lists.h'}}
-diff --git b/libcxx/utils/generate_iwyu_mapping.py a/libcxx/utils/generate_iwyu_mapping.py
-index f8377a976f08..cb27d4677395 100644
---- b/libcxx/utils/generate_iwyu_mapping.py
-+++ a/libcxx/utils/generate_iwyu_mapping.py
+Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/utils/generate_iwyu_mapping.py
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/utils/generate_iwyu_mapping.py
++++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/utils/generate_iwyu_mapping.py
 @@ -56,12 +56,11 @@ def generate_map(include):
          elif i == '__pstl_memory': continue
          elif i == '__pstl_numeric': continue
diff --git a/debian/patches/series b/debian/patches/series
index 0878cd13..9eab1c88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,5 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
+mbstate-revert-issue-62523-2.patch
 mbstate-revert-issue-62523.patch

From 64e24470ff39007475765ac4825554c42dfe07ea Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 16 May 2023 23:23:07 +0200
Subject: [PATCH 052/349] libclc: workaround a missing file pb

LLVM version: 17.0.0
clang: /build/source/build-llvm/tools/clang/stage2-bins/bin/clang
llvm-as: /build/source/build-llvm/tools/clang/stage2-bins/bin/llvm-as
llvm-link: LLVM_LINK-NOTFOUND
opt: LLVM_OPT-NOTFOUND
---
 debian/rules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/rules b/debian/rules
index e6f59d4f..5916a7c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -778,6 +778,8 @@ endif
 	touch $@
 
 debian-libclc-build:
+# workaround missing files on i386
+	cd $(TARGET_BUILD_STAGE2) && ninja opt llvm-link
 # Builds libclc
 	mkdir -p libclc/build
 	echo "Using cmake: $(CMAKE_BIN)"

From f56ba69bd7b0db41c3ecc07ebddf2a260568963e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 17 May 2023 09:21:01 +0200
Subject: [PATCH 053/349] rebase of the patches

---
 .../patches/mbstate-revert-issue-62523.patch  | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/debian/patches/mbstate-revert-issue-62523.patch b/debian/patches/mbstate-revert-issue-62523.patch
index 96252d0b..5fd56174 100644
--- a/debian/patches/mbstate-revert-issue-62523.patch
+++ b/debian/patches/mbstate-revert-issue-62523.patch
@@ -14,22 +14,22 @@ Date:   Mon Apr 17 09:38:38 2023 -0700
     
     Differential Revision: https://reviews.llvm.org/D148542
 
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/CMakeLists.txt
-@@ -622,7 +622,6 @@ set(files
-   __ranges/views.h
-   __ranges/zip_view.h
-   __split_buffer
--  __std_mbstate_t.h
-   __string/char_traits.h
-   __string/constexpr_c_functions.h
-   __string/extern_template_lists.h
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__locale
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/CMakeLists.txt
+@@ -462,7 +462,6 @@ set(files
+   __locale_dir/locale_base_api/bsd_locale_defaults.h
+   __locale_dir/locale_base_api/bsd_locale_fallbacks.h
+   __locale_dir/locale_base_api/locale_guard.h
+-  __mbstate_t.h
+   __mdspan/extents.h
+   __memory/addressof.h
+   __memory/align.h
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__locale
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/__locale
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__locale
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/__locale
++++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__locale
 @@ -26,8 +26,6 @@
  
  #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
@@ -39,10 +39,10 @@ Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/_
  #endif
  
  #if defined(_LIBCPP_MSVCRT_LIKE)
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__mbstate_t.h
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__mbstate_t.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/__mbstate_t.h
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__mbstate_t.h
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/__mbstate_t.h
++++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__mbstate_t.h
 @@ -16,27 +16,29 @@
  #  pragma GCC system_header
  #endif
@@ -88,9 +88,9 @@ Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/_
 +_LIBCPP_END_NAMESPACE_STD
 +
  #endif // _LIBCPP___MBSTATE_T_H
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__std_mbstate_t.h
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__std_mbstate_t.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/__std_mbstate_t.h
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/__std_mbstate_t.h
 +++ /dev/null
 @@ -1,29 +0,0 @@
 -// -*- C++ -*-
@@ -122,10 +122,10 @@ Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/_
 -_LIBCPP_END_NAMESPACE_STD
 -
 -#endif // _LIBCPP___STD_MBSTATE_T_H
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/iosfwd
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/iosfwd
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/iosfwd
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/iosfwd
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/iosfwd
++++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/iosfwd
 @@ -103,7 +103,7 @@ using u32streampos = fpos<char_traits<ch
  #include <__fwd/sstream.h>
  #include <__fwd/streambuf.h>
@@ -135,11 +135,11 @@ Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/i
  #include <version>
  
  #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/module.modulemap.in
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/module.modulemap.in
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/module.modulemap.in
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/module.modulemap.in
-@@ -1755,7 +1755,6 @@ module std [system] {
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/module.modulemap.in
++++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/module.modulemap.in
+@@ -1793,7 +1793,6 @@ module std [system] {
    module __mbstate_t         { private header "__mbstate_t.h"       export * }
    module __node_handle       { private header "__node_handle"       export * }
    module __split_buffer      { private header "__split_buffer"      export * }
@@ -147,10 +147,10 @@ Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/m
    module __threading_support {         header "__threading_support" export * }
    module __tree              {         header "__tree"              export * }
    module __undef_macros      {         header "__undef_macros"      export * }
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/uchar.h
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/uchar.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/uchar.h
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/uchar.h
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/uchar.h
++++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/uchar.h
 @@ -42,12 +42,10 @@ size_t c32rtomb(char* s, char32_t c32, m
  
  // Some platforms don't implement <uchar.h> and we don't want to give a hard
@@ -165,10 +165,10 @@ Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/u
  # include <stddef.h>
  #endif
  
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/wchar.h
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/wchar.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/wchar.h
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/wchar.h
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/wchar.h
++++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/wchar.h
 @@ -122,8 +122,6 @@ size_t wcsrtombs(char* restrict dst, con
  
  #  if __has_include_next(<wchar.h>)
@@ -178,22 +178,22 @@ Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/w
  #  endif
  
  // Determine whether we have const-correct overloads for wcschr and friends.
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/test/libcxx/private_headers.verify.cpp
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/test/libcxx/private_headers.verify.cpp
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/test/libcxx/private_headers.verify.cpp
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/test/libcxx/private_headers.verify.cpp
-@@ -620,7 +620,6 @@ END-SCRIPT
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/test/libcxx/private_headers.verify.cpp
++++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/test/libcxx/private_headers.verify.cpp
+@@ -625,7 +625,6 @@ END-SCRIPT
  #include <__ranges/views.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/views.h'}}
  #include <__ranges/zip_view.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/zip_view.h'}}
  #include <__split_buffer> // expected-error@*:* {{use of private header from outside its module: '__split_buffer'}}
 -#include <__std_mbstate_t.h> // expected-error@*:* {{use of private header from outside its module: '__std_mbstate_t.h'}}
- #include <__string/char_traits.h> // expected-error@*:* {{use of private header from outside its module: '__string/char_traits.h'}}
- #include <__string/constexpr_c_functions.h> // expected-error@*:* {{use of private header from outside its module: '__string/constexpr_c_functions.h'}}
- #include <__string/extern_template_lists.h> // expected-error@*:* {{use of private header from outside its module: '__string/extern_template_lists.h'}}
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/utils/generate_iwyu_mapping.py
+ #include <__stop_token/atomic_unique_lock.h> // expected-error@*:* {{use of private header from outside its module: '__stop_token/atomic_unique_lock.h'}}
+ #include <__stop_token/intrusive_list_view.h> // expected-error@*:* {{use of private header from outside its module: '__stop_token/intrusive_list_view.h'}}
+ #include <__stop_token/intrusive_shared_ptr.h> // expected-error@*:* {{use of private header from outside its module: '__stop_token/intrusive_shared_ptr.h'}}
+Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/utils/generate_iwyu_mapping.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/utils/generate_iwyu_mapping.py
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/utils/generate_iwyu_mapping.py
+--- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/utils/generate_iwyu_mapping.py
++++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/utils/generate_iwyu_mapping.py
 @@ -56,12 +56,11 @@ def generate_map(include):
          elif i == '__pstl_memory': continue
          elif i == '__pstl_numeric': continue

From 27259af5488ed863645cb0262d7dca0b048c406d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 17 May 2023 13:55:26 +0200
Subject: [PATCH 054/349] add more debian info

---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 5916a7c9..9da48c43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -531,6 +531,7 @@ preconfigure:
 	@echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)"
 	@echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)"
 	@echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)"
+	@echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)"
 
 	for f in debian/*.in; do \
 		f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \

From 7abbc3203054ef13df483f24e4aa562331707d8a Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 17 May 2023 13:55:49 +0200
Subject: [PATCH 055/349] prepare an upload

---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d9e36e0..601413d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp2) UNRELEASED; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230517014958+7ce3d9228ff1-1~exp1) experimental; urgency=medium
 
   * llvm-debuginfod not installed anymore
     https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225
+  * experimental New snapshot release
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 30 Mar 2023 11:23:10 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 17 May 2023 13:50:09 +0200
 
 llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium
 

From 9b3a7a045b2424af267ffcaf3443759b4dc33f27 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 17 May 2023 13:58:09 +0200
Subject: [PATCH 056/349] New snapshot release

---
 debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 601413d0..e7ddca25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-llvm-toolchain-snapshot (1:17~++20230517014958+7ce3d9228ff1-1~exp1) experimental; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230517015648+0b6264738f3d-1~exp1) experimental; urgency=medium
 
   * llvm-debuginfod not installed anymore
     https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225
-  * experimental New snapshot release
+  * New snapshot release
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 17 May 2023 13:50:09 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 17 May 2023 13:20:42 +0200
 
 llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium
 

From 225546cb923bbbcee4b878cf2789d4ad86ce1cb8 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 17 May 2023 14:02:49 +0200
Subject: [PATCH 057/349] 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 +--
 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 +--
 .../do-not-fail-on-unexpected-pass.diff       | 16 +++---
 debian/patches/force-sse2-compiler-rt.diff    |  8 +--
 debian/patches/issue-54242.diff               |  8 +--
 .../libclc-fix-prepare_builtins-rpath.diff    |  8 +--
 .../libcxx-libatomic-only-with-gcc-rtlib.diff |  8 +--
 ...bcxx-test-fix-lockfree-test-for-i386.patch |  8 +--
 ...test-don-t-fail-extended-long-double.patch |  8 +--
 ...ddversion-suffix-to-llvm-server-exec.patch | 10 ++--
 debian/patches/lldb/lldb-missing-install.diff | 14 ++---
 debian/patches/lldb/print-lldb-path.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/mips/mips-force-nomadd4.patch  |  8 +--
 debian/patches/mips/mips-fpxx-enable.diff     | 10 ++--
 debian/patches/omp-riscv64.patch              |  8 +--
 debian/patches/openmp-fix-runtimes-build.diff | 54 +++++++++----------
 .../patches/remove-apple-clang-manpage.diff   | 10 ++--
 debian/patches/revert-update-doc.diff         | 44 +++++++--------
 debian/patches/scan-build-clang-path.diff     |  8 +--
 debian/patches/test-keep-alive.diff           | 16 +++---
 debian/patches/unbreak-atomic-mips.diff       |  8 +--
 debian/patches/unwind-force-pthread-dl.diff   |  8 +--
 30 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
index 624d7fb1..13fcd38f 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_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_16~++20220920091612+a7d2409bac7f/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_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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,11 +40,11 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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_16~++20220920091612+a7d2409bac7f/clang/docs/analyzer/conf.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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'
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/analyzer/conf.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/analyzer/conf.py
+@@ -120,6 +120,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_16~++20220920091612+a7d2409bac7f/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_16~++20220920091612+a7d2409bac7f/clang/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py
 ===================================================================
---- 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'
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py
+@@ -134,6 +134,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_16~++20220920091612+a7d2409bac7f/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_16~++20220920091612+a7d2409bac7f/clang/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_16~++20220920091612+a7d2409bac7f/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_16~++20220920091612+a7d2409bac7f/llvm/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_16~++20220920091612+a7d2409bac7f/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_16~++20220920091612+a7d2409bac7f/polly/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/polly/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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 f7ea5633..7321fd78 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_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/ARM.cpp
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+@@ -384,7 +384,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 41bd01b1..2374afcd 100644
--- a/debian/patches/930008-arm.diff
+++ b/debian/patches/930008-arm.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/TargetParser/ARMTargetParser.cpp
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/TargetParser/ARMTargetParser.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/lib/TargetParser/ARMTargetParser.cpp
-+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/TargetParser/ARMTargetParser.cpp
-@@ -589,7 +589,7 @@ StringRef ARM::getARMCPUForArch(const ll
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/TargetParser/ARMTargetParser.cpp
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/TargetParser/ARMTargetParser.cpp
+@@ -590,7 +590,7 @@ StringRef ARM::getARMCPUForArch(const ll
      case llvm::Triple::EABIHF:
      case llvm::Triple::GNUEABIHF:
      case llvm::Triple::MuslEABIHF:
diff --git a/debian/patches/clang-baseline-fix-i386.patch b/debian/patches/clang-baseline-fix-i386.patch
index 74961c10..592d2733 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_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/X86.cpp
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/X86.cpp
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/X86.cpp
+@@ -111,8 +111,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 dd7488cd..51860c8e 100644
--- a/debian/patches/clangd-atomic-cmake.patch
+++ b/debian/patches/clangd-atomic-cmake.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extra/clangd/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9.orig/clang-tools-extra/clangd/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extra/clangd/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/clangd/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt
 @@ -61,6 +61,11 @@ endif()
  include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy")
  include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../include-cleaner/include")
@@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extr
  add_clang_library(clangDaemon
    AST.cpp
    ASTSignals.cpp
-@@ -177,6 +182,7 @@ clang_target_link_libraries(clangDaemon
+@@ -178,6 +183,7 @@ clang_target_link_libraries(clangDaemon
  target_link_libraries(clangDaemon
    PRIVATE
    ${LLVM_PTHREAD_LIB}
diff --git a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff
index e13a3bc8..e8f51b28 100644
--- a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff
+++ b/debian/patches/compiler-rt/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_16~++20220920091612+a7d2409bac7f/compiler-rt/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/CMakeLists.txt
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/CMakeLists.txt
+@@ -296,6 +296,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 10de84be..f70ac2b1 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_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/X86TargetParser.def
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/include/llvm/TargetParser/X86TargetParser.def
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/include/llvm/TargetParser/X86TargetParser.def
-+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/X86TargetParser.def
-@@ -249,7 +249,7 @@ CPU_SPECIFIC("pentium_mmx", "pentium-mmx
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/include/llvm/TargetParser/X86TargetParser.def
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/include/llvm/TargetParser/X86TargetParser.def
+@@ -251,7 +251,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/do-not-fail-on-unexpected-pass.diff b/debian/patches/do-not-fail-on-unexpected-pass.diff
index 25d064a5..2931c2ca 100644
--- a/debian/patches/do-not-fail-on-unexpected-pass.diff
+++ b/debian/patches/do-not-fail-on-unexpected-pass.diff
@@ -1,12 +1,12 @@
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/Test.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/Test.py
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/utils/lit/lit/Test.py
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/Test.py
-@@ -52,7 +52,7 @@ XFAIL       = ResultCode('XFAIL',
- UNRESOLVED  = ResultCode('UNRESOLVED',  'Unresolved', True)
- TIMEOUT     = ResultCode('TIMEOUT',     'Timed Out', True)
- FAIL        = ResultCode('FAIL',        'Failed', True)
--XPASS       = ResultCode('XPASS',       'Unexpectedly Passed', True)
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/utils/lit/lit/Test.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/Test.py
+@@ -52,7 +52,7 @@ XFAIL = ResultCode("XFAIL", "Expectedly
+ UNRESOLVED = ResultCode("UNRESOLVED", "Unresolved", True)
+ TIMEOUT = ResultCode("TIMEOUT", "Timed Out", True)
+ FAIL = ResultCode("FAIL", "Failed", True)
+-XPASS = ResultCode("XPASS", "Unexpectedly Passed", True)
 +XPASS       = ResultCode('XPASS',       'Unexpectedly Passed', False)
  
  
diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff
index 0e0c617e..a1f0bb6a 100644
--- a/debian/patches/force-sse2-compiler-rt.diff
+++ b/debian/patches/force-sse2-compiler-rt.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_17~++20230308065614+73516b355c62/compiler-rt/lib/builtins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/builtins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230308065614+73516b355c62.orig/compiler-rt/lib/builtins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230308065614+73516b355c62/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -754,6 +754,12 @@ else ()
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/lib/builtins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/builtins/CMakeLists.txt
+@@ -758,6 +758,12 @@ else ()
      append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
    endif()
  
diff --git a/debian/patches/issue-54242.diff b/debian/patches/issue-54242.diff
index 3f4fa75a..e32cc735 100644
--- a/debian/patches/issue-54242.diff
+++ b/debian/patches/issue-54242.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/mlir/lib/ExecutionEngine/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/mlir/lib/ExecutionEngine/CMakeLists.txt
 ===================================================================
---- 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)
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/mlir/lib/ExecutionEngine/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/mlir/lib/ExecutionEngine/CMakeLists.txt
+@@ -57,7 +57,7 @@ endif(LLVM_USE_PERF)
  add_mlir_library(MLIRExecutionEngine
    ExecutionEngine.cpp
  
diff --git a/debian/patches/libclc-fix-prepare_builtins-rpath.diff b/debian/patches/libclc-fix-prepare_builtins-rpath.diff
index 1e3e69b3..61d684be 100644
--- a/debian/patches/libclc-fix-prepare_builtins-rpath.diff
+++ b/debian/patches/libclc-fix-prepare_builtins-rpath.diff
@@ -1,10 +1,10 @@
 set rpath for prepare_builtins build utility to find correct stage2
 libs at runtime when executed as part of a build
-Index: llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa/libclc/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libclc/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa.orig/libclc/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa/libclc/CMakeLists.txt
-@@ -115,6 +115,9 @@ add_llvm_executable( prepare_builtins ut
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libclc/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libclc/CMakeLists.txt
+@@ -120,6 +120,9 @@ add_llvm_executable( prepare_builtins ut
  target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} )
  # These were not properly reported in early LLVM and we don't need them
  target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions )
diff --git a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff
index 3a53afe6..8020fdef 100644
--- a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff
+++ b/debian/patches/libcxx/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_16~++20220920091612+a7d2409bac7f/libcxx/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxx/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt
+@@ -707,12 +707,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 ba43d6ed..c7b97eeb 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_16~++20220920091612+a7d2409bac7f/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
 ===================================================================
---- 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 @@
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+@@ -18,6 +18,14 @@
  
  #include "test_macros.h"
  
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 929398ee..7712e3a8 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_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/test_demangle.pass.cpp
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxxabi/test/test_demangle.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/test/test_demangle.pass.cpp
-+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/test_demangle.pass.cpp
-@@ -29902,7 +29902,7 @@ const char* invalid_cases[] =
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxxabi/test/test_demangle.pass.cpp
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxxabi/test/test_demangle.pass.cpp
+@@ -30163,7 +30163,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/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
index 7c58970c..cd822211 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_17~++20211117120952+5b4bfd8c2417/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 ===================================================================
---- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-+++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-@@ -34,6 +34,7 @@
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+@@ -33,6 +33,7 @@
  #include "lldb/Utility/StreamString.h"
  #include "llvm/ADT/SmallString.h"
  #include "llvm/Support/ScopedPrinter.h"
@@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/lldb/source/Plug
  
  #include "ProcessGDBRemoteLog.h"
  
-@@ -42,7 +43,7 @@
+@@ -41,7 +42,7 @@
  #elif defined(_WIN32)
  #define DEBUGSERVER_BASENAME "lldb-server.exe"
  #else
diff --git a/debian/patches/lldb/lldb-missing-install.diff b/debian/patches/lldb/lldb-missing-install.diff
index 9bc83284..78f96947 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_15~++20220407011631+46f0e2ceb487/lldb/tools/argdumper/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/lldb/tools/argdumper/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/argdumper/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/argdumper/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt
 @@ -6,3 +6,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM
  )
  
@@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/argdu
 +
 +install(TARGETS lldb-argdumper
 +  RUNTIME DESTINATION bin)
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/lldb-server/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/lldb/tools/lldb-server/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/lldb-server/CMakeLists.txt
-@@ -66,3 +66,7 @@ add_dependencies(lldb-server
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/lldb-server/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt
+@@ -68,3 +68,7 @@ add_dependencies(lldb-server
  )
  target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source")
  target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS})
diff --git a/debian/patches/lldb/print-lldb-path.patch b/debian/patches/lldb/print-lldb-path.patch
index 1b11531f..b9bb3b79 100644
--- a/debian/patches/lldb/print-lldb-path.patch
+++ b/debian/patches/lldb/print-lldb-path.patch
@@ -1,11 +1,11 @@
 Author: Gianfranco Costamagna <locutusofborg@debian.org>
 Last-Update: 2023-01-19
 
-Index: llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py
 ===================================================================
---- llvm-toolchain-15-15.0.6.orig/lldb/bindings/python/get-python-config.py
-+++ llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py
-@@ -15,6 +15,7 @@
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/bindings/python/get-python-config.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py
+@@ -15,6 +15,7 @@ def relpath_nodots(path, base):
      return rel
  
  def main():
@@ -13,7 +13,7 @@ Index: llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py
      parser = argparse.ArgumentParser(description="extract cmake variables from python")
      parser.add_argument("variable_name")
      args = parser.parse_args()
-@@ -31,7 +32,19 @@
+@@ -31,7 +32,19 @@ def main():
          # If not, you'll have to use lldb -P or lldb -print-script-interpreter-info
          # to figure out where it is.
          try:
@@ -34,11 +34,11 @@ Index: llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py
          except ValueError:
              # Try to fall back to something reasonable if sysconfig's platlib
              # is outside of sys.prefix
-Index: llvm-toolchain-15-15.0.6/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
 ===================================================================
---- llvm-toolchain-15-15.0.6.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-+++ llvm-toolchain-15-15.0.6/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-@@ -238,6 +238,7 @@
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+@@ -240,6 +240,7 @@ void ScriptInterpreterPython::ComputePyt
    // the real python interpreter uses.  (e.g. lib for most, lib64 on RHEL
    // x86_64, or bin on Windows).
    llvm::sys::path::remove_filename(path);
diff --git a/debian/patches/llvm-runtimes-builtins-build-check.diff b/debian/patches/llvm-runtimes-builtins-build-check.diff
index b92225b3..eec769df 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_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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
-@@ -124,7 +124,12 @@ endfunction()
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt
+@@ -129,7 +129,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 e00aed77..4bc3c25c 100644
--- a/debian/patches/lower-python-dep.diff
+++ b/debian/patches/lower-python-dep.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/CMakeLists.txt
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/CMakeLists.txt
+@@ -836,8 +836,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 09213f3c..ae99d678 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_16~++20220920091612+a7d2409bac7f/llvm/lib/MC/ELFObjectWriter.cpp
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/MC/ELFObjectWriter.cpp
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/MC/ELFObjectWriter.cpp
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/MC/ELFObjectWriter.cpp
+@@ -1401,6 +1401,17 @@ bool ELFObjectWriter::shouldRelocateWith
        if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS &&
            !hasRelocationAddend())
          return true;
diff --git a/debian/patches/mips/mips-force-nomadd4.patch b/debian/patches/mips/mips-force-nomadd4.patch
index 95bf29b9..208b226e 100644
--- a/debian/patches/mips/mips-force-nomadd4.patch
+++ b/debian/patches/mips/mips-force-nomadd4.patch
@@ -6,11 +6,11 @@ support both, we have to disabled those instructions.
 For that, the patch below basically corresponds to the --with-madd4=no
 used on the GCC side.
 
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Basic/Targets/Mips.h
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Basic/Targets/Mips.h
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Basic/Targets/Mips.h
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Basic/Targets/Mips.h
-@@ -332,6 +332,8 @@ public:
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Basic/Targets/Mips.h
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Basic/Targets/Mips.h
+@@ -331,6 +331,8 @@ public:
          HasMSA = true;
        else if (Feature == "+nomadd4")
          DisableMadd4 = true;
diff --git a/debian/patches/mips/mips-fpxx-enable.diff b/debian/patches/mips/mips-fpxx-enable.diff
index d983d0c6..86c6b1d0 100644
--- a/debian/patches/mips/mips-fpxx-enable.diff
+++ b/debian/patches/mips/mips-fpxx-enable.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/Mips/MipsSubtarget.cpp
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/Target/Mips/MipsSubtarget.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp
-+++ llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/Mips/MipsSubtarget.cpp
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/Target/Mips/MipsSubtarget.cpp
 @@ -81,7 +81,7 @@ MipsSubtarget::MipsSubtarget(const Tripl
        InMips16HardFloat(Mips16HardFloat), InMicroMipsMode(false), HasDSP(false),
        HasDSPR2(false), HasDSPR3(false), AllowMixed16_32(Mixed16_32 || Mips_Os16),
@@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/
    // MIPS-I has not been tested.
    if (MipsArchVersion == Mips1 && !MIPS1WarningPrinted) {
      errs() << "warning: MIPS-I support is experimental\n";
-@@ -243,6 +246,7 @@ MipsSubtarget &
+@@ -242,6 +245,7 @@ MipsSubtarget &
  MipsSubtarget::initializeSubtargetDependencies(StringRef CPU, StringRef FS,
                                                 const TargetMachine &TM) {
    StringRef CPUName = MIPS_MC::selectMipsCPU(TM.getTargetTriple(), CPU);
@@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/
  
    // Parse features string.
    ParseSubtargetFeatures(CPUName, /*TuneCPU*/ CPUName, FS);
-@@ -265,6 +269,13 @@ MipsSubtarget::initializeSubtargetDepend
+@@ -264,6 +268,13 @@ MipsSubtarget::initializeSubtargetDepend
      report_fatal_error("64-bit code requested on a subtarget that doesn't "
                         "support it!");
  
diff --git a/debian/patches/omp-riscv64.patch b/debian/patches/omp-riscv64.patch
index bd781bb0..760aedfd 100644
--- a/debian/patches/omp-riscv64.patch
+++ b/debian/patches/omp-riscv64.patch
@@ -1,11 +1,11 @@
 Description: Define the affinity for riscv64
 Last-Update: 2021-08-27
 
-Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/openmp/runtime/src/kmp_affinity.h
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/kmp_affinity.h
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/openmp/runtime/src/kmp_affinity.h
-+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/openmp/runtime/src/kmp_affinity.h
-@@ -210,6 +210,17 @@ public:
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/src/kmp_affinity.h
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/kmp_affinity.h
+@@ -212,6 +212,17 @@ public:
  #elif __NR_sched_getaffinity != 123
  #error Wrong code for getaffinity system call.
  #endif /* __NR_sched_getaffinity */
diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index d5e5b2d4..13b4ba43 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt
 @@ -236,6 +236,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}
@@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/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_17~++20230507104621+728b8a139804/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/CMakeLists.txt
-@@ -91,6 +91,28 @@ else()
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/CMakeLists.txt
+@@ -94,6 +94,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
  
@@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/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_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -55,6 +55,8 @@ endif()
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -82,10 +82,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/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_17~++20230507104621+728b8a139804/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/src/CMakeLists.txt
 @@ -36,7 +36,9 @@ add_llvm_library(omptarget
    omp
  
@@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -112,11 +112,11 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/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_17~++20230507104621+728b8a139804/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/src/CMakeLists.txt
-@@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/CMakeLists.txt
+@@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
    set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
@@ -124,7 +124,7 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/s
  else()
    set(LIBOMP_LINKER_LANGUAGE CXX)
  endif()
-@@ -201,6 +202,8 @@ else()
+@@ -200,6 +201,8 @@ else()
    )
  endif()
  
@@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/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_17~++20230507104621+728b8a139804/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    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 47e7bd78..6548700c 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_16~++20220920091612+a7d2409bac7f/clang/docs/CommandGuide/clang.rst
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/CommandGuide/clang.rst
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/CommandGuide/clang.rst
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/CommandGuide/clang.rst
+@@ -353,24 +353,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_16~++20220920091612+a7d2409bac7f/clang/docs/Comma
  .. option:: --print-supported-cpus
  
    Print out a list of supported processors for the given target (specified
-@@ -681,11 +667,6 @@ ENVIRONMENT
+@@ -705,11 +691,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/revert-update-doc.diff b/debian/patches/revert-update-doc.diff
index aeea4c23..6a29aa65 100644
--- a/debian/patches/revert-update-doc.diff
+++ b/debian/patches/revert-update-doc.diff
@@ -15,10 +15,10 @@ Date:   Tue Feb 1 23:13:01 2022 -0800
     
     Differential Revision: https://reviews.llvm.org/D112181
 
-Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extra/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/clang-tools-extra/docs/conf.py
-+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extra/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py
 @@ -44,6 +44,15 @@ master_doc = 'index'
  project = u'Extra Clang Tools'
  copyright = u'2007-%d, The Clang Team' % date.today().year
@@ -47,10 +47,10 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extr
  
  # -- Options for HTML output ---------------------------------------------------
  
-Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/clang/docs/conf.py
-+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py
 @@ -62,6 +62,15 @@ master_doc = 'index'
  project = u'Clang'
  copyright = u'2007-%d, The Clang Team' % date.today().year
@@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf.
  
  # -- Options for HTML output ---------------------------------------------------
  
-Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lld/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/lld/docs/conf.py
-+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lld/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lld/docs/conf.py
 @@ -43,6 +43,15 @@ master_doc = 'index'
  project = u'lld'
  copyright = u'2011-%d, LLVM Project' % date.today().year
@@ -99,10 +99,10 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
  #language = None
-Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modules/AddSphinxTarget.cmake
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/cmake/modules/AddSphinxTarget.cmake
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/llvm/cmake/modules/AddSphinxTarget.cmake
-+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modules/AddSphinxTarget.cmake
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/cmake/modules/AddSphinxTarget.cmake
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/cmake/modules/AddSphinxTarget.cmake
 @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj
      set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
    endif()
@@ -124,13 +124,13 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modul
                              ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested
                              "${ARG_SOURCE_DIR}" # Source
                              "${SPHINX_BUILD_DIR}" # Output
-Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/llvm/docs/conf.py
-+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.py
-@@ -61,6 +61,15 @@ master_doc = 'index'
- project = u'LLVM'
- copyright = u'2003-%d, LLVM Project' % date.today().year
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/conf.py
+@@ -62,6 +62,15 @@ master_doc = "index"
+ project = "LLVM"
+ copyright = "2003-%d, LLVM Project" % date.today().year
  
 +# The version info for the project you're documenting, acts as replacement for
 +# |version| and |release|, also used in various other places throughout the
@@ -143,11 +143,11 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.p
 +
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
- #language = None
-Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/polly/docs/conf.py
+ # language = None
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/polly/docs/conf.py
-+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/polly/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/polly/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/conf.py
 @@ -44,6 +44,15 @@ master_doc = 'index'
  project = u'Polly'
  copyright = u'2010-%d, The Polly Team' % date.today().year
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 1a3c5a37..cbc11e45 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -2,11 +2,11 @@
  clang/tools/scan-build/bin/scan-build |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/bin/scan-build
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan-build/bin/scan-build
 ===================================================================
---- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/tools/scan-build/bin/scan-build
-+++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/bin/scan-build
-@@ -1786,7 +1786,7 @@ sub FindClang {
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/tools/scan-build/bin/scan-build
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan-build/bin/scan-build
+@@ -1485,7 +1485,7 @@ sub FindClang {
    if (!defined $Options{AnalyzerDiscoveryMethod}) {
      $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
      if (!defined $Clang || ! -x $Clang) {
diff --git a/debian/patches/test-keep-alive.diff b/debian/patches/test-keep-alive.diff
index a1074816..ff20daa4 100644
--- a/debian/patches/test-keep-alive.diff
+++ b/debian/patches/test-keep-alive.diff
@@ -1,20 +1,20 @@
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/ProgressBar.py
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/ProgressBar.py
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/utils/lit/lit/ProgressBar.py
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/ProgressBar.py
-@@ -189,15 +189,7 @@ class SimpleProgressBar:
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/utils/lit/lit/ProgressBar.py
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/ProgressBar.py
+@@ -203,15 +203,7 @@ class SimpleProgressBar:
              return
  
          for i in range(self.atIndex, next):
 -            idx = i % 5
 -            if idx == 0:
--                sys.stdout.write('%2d' % (i*2))
+-                sys.stdout.write("%2d" % (i * 2))
 -            elif idx == 1:
--                pass # Skip second char
+-                pass  # Skip second char
 -            elif idx < 4:
--                sys.stdout.write('.')
+-                sys.stdout.write(".")
 -            else:
--                sys.stdout.write(' ')
+-                sys.stdout.write(" ")
 +            sys.stdout.write('%-2d ' % (i*2))
          sys.stdout.flush()
          self.atIndex = next
diff --git a/debian/patches/unbreak-atomic-mips.diff b/debian/patches/unbreak-atomic-mips.diff
index ddfb25fc..9b251453 100644
--- a/debian/patches/unbreak-atomic-mips.diff
+++ b/debian/patches/unbreak-atomic-mips.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/scudo/standalone/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/scudo/standalone/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/scudo/standalone/CMakeLists.txt
-@@ -145,6 +145,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/scudo/standalone/CMakeLists.txt
+@@ -178,6 +178,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH
    list(APPEND SCUDO_LINK_LIBS atomic)
  endif()
  
diff --git a/debian/patches/unwind-force-pthread-dl.diff b/debian/patches/unwind-force-pthread-dl.diff
index d389bca4..5002aa2f 100644
--- a/debian/patches/unwind-force-pthread-dl.diff
+++ b/debian/patches/unwind-force-pthread-dl.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/libunwind/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libunwind/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/libunwind/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/libunwind/CMakeLists.txt
-@@ -308,14 +308,17 @@ if (MSVC)
+--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libunwind/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libunwind/CMakeLists.txt
+@@ -277,14 +277,17 @@ if (MSVC)
    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
  endif()
  

From 24a63dd82586b290e93c29ba2584a98b4b922a49 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 17 May 2023 14:29:10 +0200
Subject: [PATCH 058/349] try to bring back mbstate

---
 debian/patches/series | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 9eab1c88..9bfdaa71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,5 +148,5 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-mbstate-revert-issue-62523-2.patch
-mbstate-revert-issue-62523.patch
+#mbstate-revert-issue-62523-2.patch
+#mbstate-revert-issue-62523.patch

From 340d20f02afc704e760d00f58417c8e976a80a82 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 17 May 2023 15:43:37 +0200
Subject: [PATCH 059/349] Revert "try to bring back mbstate"

This reverts commit 24a63dd82586b290e93c29ba2584a98b4b922a49.
---
 debian/patches/series | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 9bfdaa71..9eab1c88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,5 +148,5 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-#mbstate-revert-issue-62523-2.patch
-#mbstate-revert-issue-62523.patch
+mbstate-revert-issue-62523-2.patch
+mbstate-revert-issue-62523.patch

From d104c1831ba5939af6095f1122e3c6677c3c742d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 18 May 2023 00:33:59 +0200
Subject: [PATCH 060/349] Revert "Revert "try to bring back mbstate""

This reverts commit 340d20f02afc704e760d00f58417c8e976a80a82.
---
 debian/patches/series | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 9eab1c88..9bfdaa71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,5 +148,5 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-mbstate-revert-issue-62523-2.patch
-mbstate-revert-issue-62523.patch
+#mbstate-revert-issue-62523-2.patch
+#mbstate-revert-issue-62523.patch

From ce8d897aa7f0b544fefd8539120a8e21cafcbb02 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 18 May 2023 12:18:43 +0200
Subject: [PATCH 061/349] workaround issue 62523

---
 debian/patches/link-grpc.diff                 |  18 +-
 .../mbstate-revert-issue-62523-2.patch        | 108 ---------
 .../patches/mbstate-revert-issue-62523.patch  | 210 ------------------
 .../mbstate_workaround_issue_62523.diff       |  14 ++
 debian/patches/series                         |   3 +-
 5 files changed, 25 insertions(+), 328 deletions(-)
 delete mode 100644 debian/patches/mbstate-revert-issue-62523-2.patch
 delete mode 100644 debian/patches/mbstate-revert-issue-62523.patch
 create mode 100644 debian/patches/mbstate_workaround_issue_62523.diff

diff --git a/debian/patches/link-grpc.diff b/debian/patches/link-grpc.diff
index 13fa0d5c..708e5bc8 100644
--- a/debian/patches/link-grpc.diff
+++ b/debian/patches/link-grpc.diff
@@ -1,7 +1,8 @@
-diff --git a/clang/cmake/modules/AddGRPC.cmake b/clang/cmake/modules/AddGRPC.cmake
---- a/clang/cmake/modules/AddGRPC.cmake
-+++ b/clang/cmake/modules/AddGRPC.cmake
-@@ -4,8 +4,13 @@
+Index: llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/clang/cmake/modules/AddGRPC.cmake
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55.orig/clang/cmake/modules/AddGRPC.cmake
++++ llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/clang/cmake/modules/AddGRPC.cmake
+@@ -4,8 +4,13 @@ function(generate_clang_protos_library L
    # Take the first two args and forward the remaining to generate_proto_sources.
    cmake_parse_arguments(PARSE_ARGV 2 PROTO "" "" "")
    generate_proto_sources(ProtoSource ${ProtoFile} ${PROTO_UNPARSED_ARGUMENTS})
@@ -16,10 +17,11 @@ diff --git a/clang/cmake/modules/AddGRPC.cmake b/clang/cmake/modules/AddGRPC.cma
 +    LINK_LIBS PUBLIC  ${LINKED_GRPC_LIBRARIES})
 +
  endfunction()
-diff --git a/cmake/Modules/FindGRPC.cmake b/cmake/Modules/FindGRPC.cmake
---- a/cmake/Modules/FindGRPC.cmake
-+++ b/cmake/Modules/FindGRPC.cmake
-@@ -82,11 +82,28 @@
+Index: llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/cmake/Modules/FindGRPC.cmake
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55.orig/cmake/Modules/FindGRPC.cmake
++++ llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/cmake/Modules/FindGRPC.cmake
+@@ -82,11 +82,28 @@ else()
      endif()
    endif()
    if(NOT TARGET grpc++)
diff --git a/debian/patches/mbstate-revert-issue-62523-2.patch b/debian/patches/mbstate-revert-issue-62523-2.patch
deleted file mode 100644
index 336bdea5..00000000
--- a/debian/patches/mbstate-revert-issue-62523-2.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-commit 0ec57bf7b18e8918dd8ced007a88467b798677c6
-Author: Jordan Rupprecht <rupprecht@google.com>
-Date:   Wed May 10 15:43:37 2023 -0700
-
-    [libc++] Consistently enable __CORRECT_ISO_CPP_WCHAR_H_PROTO in mbstate.
-    
-    In libc++'s `wchar.h`, before we forward to the system `wchar.h`, we set `__CORRECT_ISO_CPP_WCHAR_H_PROTO` to ensure it defines the correct signature (e.g. `extern "C++" const wchar_t *wmemchr` and not `extern wchar_t *wmemchr`). After D148542, there are cases where we include the system `wchar.h` from within `__mbstate_t.h` without setting that, and so we get a function type mismatch if we transitively include `wchar.h` through multiple headers in a modules-enabled build. Consistently setting it here resolves those build errors.
-    
-    Alternative 1: we could put this in `__config` instead. I chose to put it here for a more limited scope.
-    
-    Alternative 2: we could patch `wchar.h` itself to work correctly and remove references `__CORRECT_ISO_CPP_WCHAR_H_PROTO` from libc++ entirely. It does already set it, but with an additional condition that it is being built by GCC >= 4.4. Clang does pretend to be GCC via `__GNUC__` etc. which can be controlled via `-fgnuc-version` command line flags, but that might have other consequences.
-    
-    Reviewed By: ldionne, #libc, MaskRay
-    
-    Differential Revision: https://reviews.llvm.org/D150015
-
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__mbstate_t.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/__mbstate_t.h
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/__mbstate_t.h
-@@ -27,14 +27,6 @@
- // This does not define std::mbstate_t -- this only brings in the declaration
- // in the global namespace.
- 
--// We define this here to support older versions of glibc <wchar.h> that do
--// not define this for clang. This is also set in libc++'s <wchar.h> header,
--// and we need to do so here too to avoid a different function signature given
--// a different include order.
--#ifdef __cplusplus
--#  define __CORRECT_ISO_CPP_WCHAR_H_PROTO
--#endif
--
- #if __has_include(<bits/types/mbstate_t.h>)
- #   include <bits/types/mbstate_t.h> // works on most Unixes
- #elif __has_include(<sys/_types/_mbstate_t.h>)
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/wchar.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/include/wchar.h
-+++ llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/include/wchar.h
-@@ -116,8 +116,6 @@ size_t wcsrtombs(char* restrict dst, con
- #  pragma GCC system_header
- #endif
- 
--// We define this here to support older versions of glibc <wchar.h> that do
--// not define this for clang.
- #ifdef __cplusplus
- #define __CORRECT_ISO_CPP_WCHAR_H_PROTO
- #endif
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/test/std/strings/c.strings/cwchar_include_order1.compile.verify.cpp
-===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/test/std/strings/c.strings/cwchar_include_order1.compile.verify.cpp
-+++ /dev/null
-@@ -1,25 +0,0 @@
--//===----------------------------------------------------------------------===//
--//
--// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
--// See https://llvm.org/LICENSE.txt for license information.
--// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
--//
--//===----------------------------------------------------------------------===//
--
--// <cwchar>
--
--// XFAIL: no-wide-characters
--
--// Tests that include ordering does not affect the definition of wcsstr.
--// See: https://llvm.org/PR62638
--
--// clang-format off
--#include <cwchar>
--#include <iosfwd>
--// clang-format on
--
--void func() {
--  wchar_t* v1;
--  const wchar_t* cv2 = L"/";
--  v1 = wcsstr(cv2, L"/"); // expected-error {{assigning to 'wchar_t *' from 'const wchar_t *' discards qualifiers}}
--}
-Index: llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd/libcxx/test/std/strings/c.strings/cwchar_include_order2.compile.verify.cpp
-===================================================================
---- llvm-toolchain-snapshot_17~++20230512092652+af161ffc7fdd.orig/libcxx/test/std/strings/c.strings/cwchar_include_order2.compile.verify.cpp
-+++ /dev/null
-@@ -1,25 +0,0 @@
--//===----------------------------------------------------------------------===//
--//
--// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
--// See https://llvm.org/LICENSE.txt for license information.
--// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
--//
--//===----------------------------------------------------------------------===//
--
--// <cwchar>
--
--// XFAIL: no-wide-characters
--
--// Tests that include ordering does not affect the definition of wcsstr.
--// See: https://llvm.org/PR62638
--
--// clang-format off
--#include <iosfwd>
--#include <cwchar>
--// clang-format on
--
--void func() {
--  wchar_t* v1;
--  const wchar_t* cv2 = L"/";
--  v1 = wcsstr(cv2, L"/"); // expected-error {{assigning to 'wchar_t *' from 'const wchar_t *' discards qualifiers}}
--}
diff --git a/debian/patches/mbstate-revert-issue-62523.patch b/debian/patches/mbstate-revert-issue-62523.patch
deleted file mode 100644
index 5fd56174..00000000
--- a/debian/patches/mbstate-revert-issue-62523.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-commit a595b931f1f91897317a4257df313bddfeb029a6
-Author: Ian Anderson <iana@apple.com>
-Date:   Mon Apr 17 09:38:38 2023 -0700
-
-    [libc++] cuchar redeclares ::mbstate_t when it's in its own clang module
-    
-    When cuchar is compiled independently on platforms that don't have <uchar.h>, it doesn't get a declaration of mbstate_t, and so makes an empty declaration for ::mbstate_t. That conflicts with the declarations in __mbstate_t.h and cwchar since both of those headers do get mbstate_t before making ::mbstate_t.
-    
-    Change `__mbstate_t.h` to just get the underlying declaration for mbstate_t and not make a declaration for ::mbstate_t. Include __mbstate_t.h in uchar.h and wchar.h when their next headers aren't available so that at least mbstate_t gets defined.
-    
-    Add __std_mbstate_t.h to declare ::mbstate_t for headers that need that when cuchar or cwchar aren't available (because either _LIBCPP_HAS_NO_WIDE_CHARACTERS or _LIBCPP_CXX03_LANG).
-    
-    Reviewed By: ldionne, Mordante, #libc, philnik
-    
-    Differential Revision: https://reviews.llvm.org/D148542
-
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/CMakeLists.txt
-@@ -462,7 +462,6 @@ set(files
-   __locale_dir/locale_base_api/bsd_locale_defaults.h
-   __locale_dir/locale_base_api/bsd_locale_fallbacks.h
-   __locale_dir/locale_base_api/locale_guard.h
--  __mbstate_t.h
-   __mdspan/extents.h
-   __memory/addressof.h
-   __memory/align.h
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__locale
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/__locale
-+++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__locale
-@@ -26,8 +26,6 @@
- 
- #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
- #  include <cwchar>
--#else
--#  include <__std_mbstate_t.h>
- #endif
- 
- #if defined(_LIBCPP_MSVCRT_LIKE)
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__mbstate_t.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/__mbstate_t.h
-+++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__mbstate_t.h
-@@ -16,27 +16,29 @@
- #  pragma GCC system_header
- #endif
- 
--// The goal of this header is to provide mbstate_t without requiring all of
--// <uchar.h> or <wchar.h>. It's also used by the libc++ versions of <uchar.h>
--// and <wchar.h> to get mbstate_t when the C library doesn't provide <uchar.h>
--// or <wchar.h>, hence the #include_next of those headers instead of #include.
--// (e.g. if <wchar.h> isn't present in the C library, the libc++ <wchar.h>
--// will include this header. This header needs to not turn around and cyclically
--// include <wchar.h>, but fall through to <uchar.h>.)
-+// TODO(ldionne):
-+// The goal of this header is to provide mbstate_t without having to pull in
-+// <wchar.h> or <uchar.h>. This is necessary because we need that type even
-+// when we don't have (or try to provide) support for wchar_t, because several
-+// types like std::fpos are defined in terms of mbstate_t.
- //
--// This does not define std::mbstate_t -- this only brings in the declaration
--// in the global namespace.
-+// This is a gruesome hack, but I don't know how to make it cleaner for
-+// the time being.
- 
--#if __has_include(<bits/types/mbstate_t.h>)
-+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
-+#   include <wchar.h> // for mbstate_t
-+#elif __has_include(<bits/types/mbstate_t.h>)
- #   include <bits/types/mbstate_t.h> // works on most Unixes
- #elif __has_include(<sys/_types/_mbstate_t.h>)
- #   include <sys/_types/_mbstate_t.h> // works on Darwin
--#elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>)
--#   include_next <wchar.h> // fall back to the C standard provider of mbstate_t
--#elif __has_include_next(<uchar.h>)
--#   include_next <uchar.h> // <uchar.h> is also required to make mbstate_t visible
- #else
--#   error "We don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
-+#   error "The library was configured without support for wide-characters, but we don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
- #endif
- 
-+_LIBCPP_BEGIN_NAMESPACE_STD
-+
-+using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
-+
-+_LIBCPP_END_NAMESPACE_STD
-+
- #endif // _LIBCPP___MBSTATE_T_H
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/__std_mbstate_t.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/__std_mbstate_t.h
-+++ /dev/null
-@@ -1,29 +0,0 @@
--// -*- C++ -*-
--//===----------------------------------------------------------------------===//
--//
--// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
--// See https://llvm.org/LICENSE.txt for license information.
--// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
--//
--//===----------------------------------------------------------------------===//
--
--#ifndef _LIBCPP___STD_MBSTATE_T_H
--#define _LIBCPP___STD_MBSTATE_T_H
--
--#include <__config>
--#include <__mbstate_t.h>
--
--#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
--#  pragma GCC system_header
--#endif
--
--// The goal of this header is to provide std::mbstate_t without requiring all
--// of <cuchar> or <cwchar>.
--
--_LIBCPP_BEGIN_NAMESPACE_STD
--
--using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
--
--_LIBCPP_END_NAMESPACE_STD
--
--#endif // _LIBCPP___STD_MBSTATE_T_H
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/iosfwd
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/iosfwd
-+++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/iosfwd
-@@ -103,7 +103,7 @@ using u32streampos = fpos<char_traits<ch
- #include <__fwd/sstream.h>
- #include <__fwd/streambuf.h>
- #include <__fwd/string.h>
--#include <__std_mbstate_t.h>
-+#include <__mbstate_t.h>
- #include <version>
- 
- #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/module.modulemap.in
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/module.modulemap.in
-+++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/module.modulemap.in
-@@ -1793,7 +1793,6 @@ module std [system] {
-   module __mbstate_t         { private header "__mbstate_t.h"       export * }
-   module __node_handle       { private header "__node_handle"       export * }
-   module __split_buffer      { private header "__split_buffer"      export * }
--  module __std_mbstate_t     { private header "__std_mbstate_t.h"   export * }
-   module __threading_support {         header "__threading_support" export * }
-   module __tree              {         header "__tree"              export * }
-   module __undef_macros      {         header "__undef_macros"      export * }
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/uchar.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/uchar.h
-+++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/uchar.h
-@@ -42,12 +42,10 @@ size_t c32rtomb(char* s, char32_t c32, m
- 
- // Some platforms don't implement <uchar.h> and we don't want to give a hard
- // error on those platforms. When the platform doesn't provide <uchar.h>, at
--// least include <stddef.h> so we get the declaration for size_t, and try to
--// get the declaration of mbstate_t too.
-+// least include <stddef.h> so we get the declaration for size_t.
- #if __has_include_next(<uchar.h>)
- # include_next <uchar.h>
- #else
--# include <__mbstate_t.h>
- # include <stddef.h>
- #endif
- 
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/wchar.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/include/wchar.h
-+++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/include/wchar.h
-@@ -122,8 +122,6 @@ size_t wcsrtombs(char* restrict dst, con
- 
- #  if __has_include_next(<wchar.h>)
- #    include_next <wchar.h>
--#  else
--#    include <__mbstate_t.h> // make sure we have mbstate_t regardless of the existence of <wchar.h>
- #  endif
- 
- // Determine whether we have const-correct overloads for wcschr and friends.
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/test/libcxx/private_headers.verify.cpp
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/test/libcxx/private_headers.verify.cpp
-+++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/test/libcxx/private_headers.verify.cpp
-@@ -625,7 +625,6 @@ END-SCRIPT
- #include <__ranges/views.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/views.h'}}
- #include <__ranges/zip_view.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/zip_view.h'}}
- #include <__split_buffer> // expected-error@*:* {{use of private header from outside its module: '__split_buffer'}}
--#include <__std_mbstate_t.h> // expected-error@*:* {{use of private header from outside its module: '__std_mbstate_t.h'}}
- #include <__stop_token/atomic_unique_lock.h> // expected-error@*:* {{use of private header from outside its module: '__stop_token/atomic_unique_lock.h'}}
- #include <__stop_token/intrusive_list_view.h> // expected-error@*:* {{use of private header from outside its module: '__stop_token/intrusive_list_view.h'}}
- #include <__stop_token/intrusive_shared_ptr.h> // expected-error@*:* {{use of private header from outside its module: '__stop_token/intrusive_shared_ptr.h'}}
-Index: llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/utils/generate_iwyu_mapping.py
-===================================================================
---- llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287.orig/libcxx/utils/generate_iwyu_mapping.py
-+++ llvm-toolchain-snapshot_17~++20230517091838+e335e8a43287/libcxx/utils/generate_iwyu_mapping.py
-@@ -56,12 +56,11 @@ def generate_map(include):
-         elif i == '__pstl_memory': continue
-         elif i == '__pstl_numeric': continue
-         elif i == '__split_buffer': public = ['deque', 'vector']
--        elif i == '__std_mbstate_t.h': continue
-         elif i == '__threading_support': public = ['atomic', 'mutex', 'semaphore', 'thread']
-         elif i == '__tree': public = ['map', 'set']
-         elif i == '__undef_macros': continue
-         elif i == '__verbose_abort': continue
--        else: panic(i)
-+        else: panic()
- 
-         for p in public:
-             result.append(f'{generate(f"<{i}>", p)},')
diff --git a/debian/patches/mbstate_workaround_issue_62523.diff b/debian/patches/mbstate_workaround_issue_62523.diff
new file mode 100644
index 00000000..9e4373e9
--- /dev/null
+++ b/debian/patches/mbstate_workaround_issue_62523.diff
@@ -0,0 +1,14 @@
+Index: llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/libcxx/i>
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55.orig/libcxx>
++++ llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/libcxx/incl>
+@@ -122,6 +122,8 @@ size_t wcsrtombs(char* restrict dst, con
+ #define __CORRECT_ISO_CPP_WCHAR_H_PROTO
+ #endif
+
++#define __DEFINED_mbstate_t
++
+ #  if __has_include_next(<wchar.h>)
+ #    include_next <wchar.h>
+ #  else
+
diff --git a/debian/patches/series b/debian/patches/series
index 9bfdaa71..372ab88a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,5 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-#mbstate-revert-issue-62523-2.patch
-#mbstate-revert-issue-62523.patch
+mbstate_workaround_issue_62523.diff

From 9f7d1a06884df796d4d4c8e49d4710355c1dab4e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 18 May 2023 14:35:06 +0200
Subject: [PATCH 062/349] fix the patch

---
 debian/patches/mbstate_workaround_issue_62523.diff | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/mbstate_workaround_issue_62523.diff b/debian/patches/mbstate_workaround_issue_62523.diff
index 9e4373e9..3a64c3d7 100644
--- a/debian/patches/mbstate_workaround_issue_62523.diff
+++ b/debian/patches/mbstate_workaround_issue_62523.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/libcxx/i>
+Index: llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/libcxx/include/wchar.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55.orig/libcxx>
-+++ llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/libcxx/incl>
+--- llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55.orig/libcxx/include/wchar.h
++++ llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/libcxx/include/wchar.h
 @@ -122,6 +122,8 @@ size_t wcsrtombs(char* restrict dst, con
  #define __CORRECT_ISO_CPP_WCHAR_H_PROTO
  #endif

From ec5a6356858ed9398e549165f73acb4c3b15b6a2 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 21 May 2023 22:43:09 +0200
Subject: [PATCH 063/349] Yet a new element (omp) to disable in cmake
 detection. Upstream #62622

---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e7ddca25..f8cab306 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ llvm-toolchain-snapshot (1:17~++20230517015648+0b6264738f3d-1~exp1) experimental
   * llvm-debuginfod not installed anymore
     https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225
   * New snapshot release
+  * Yet a new element (omp) to disable in cmake detection. Upstream #62622
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 17 May 2023 13:20:42 +0200
 
diff --git a/debian/rules b/debian/rules
index 9da48c43..ffc034e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1142,7 +1142,7 @@ endif
 	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT
 
 # Disable CMake's package validation checks for target files that we may remove.
-	sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake
+	sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|omptarget\|omp\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake
 
 # Also disable mlir-* checks in the cmake
 	sed -i '/_IMPORT_CHECK_TARGETS \(mlir-\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake

From aca1ec2f41f753eaa15b44c7aabc2b834ff49be8 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 23 May 2023 09:40:23 +0200
Subject: [PATCH 064/349] rebase of the patches after the black changes

---
 debian/patches/0044-soname.diff               |  14 +-
 ...e-Debian-provided-MathJax-everywhere.patch |  56 +-
 debian/patches/clang-format-version.diff      |  42 +-
 debian/patches/clang-tidy-run-bin.diff        |  32 +-
 ...pilerrt-build-scudo-standalone-option.diff |   8 +-
 .../compilerrt-builtins-arch-fix-armhf.diff   |   8 +-
 debian/patches/debug-jit-path.diff            |   8 +-
 debian/patches/disable-path-test-failing.diff |  12 +-
 debian/patches/force-sse2-compiler-rt.diff    |   8 +-
 .../libclc-fix-prepare_builtins-rpath.diff    |   8 +-
 debian/patches/lldb/lldb-soname.diff          |  12 +-
 debian/patches/llvm-fix-lld-linker-check.diff |   8 +-
 debian/patches/lower-python-dep.diff          |   8 +-
 debian/patches/openmp-fix-runtimes-build.diff |  54 +-
 debian/patches/openmp-soname.diff             |   8 +-
 debian/patches/python-clangpath.diff          |  18 +-
 debian/patches/python3-shebang.patch          | 492 +++++++++---------
 debian/patches/revert-update-doc.diff         |  60 +--
 .../scan-build-py-fix-default-bin.diff        |  20 +-
 debian/patches/unwind-force-pthread-dl.diff   |   6 +-
 debian/patches/wasm/wasm-sysroot-usr.diff     |  22 +-
 21 files changed, 457 insertions(+), 447 deletions(-)

diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff
index 27efc32f..c678f7b0 100644
--- a/debian/patches/0044-soname.diff
+++ b/debian/patches/0044-soname.diff
@@ -3,11 +3,11 @@
  tools/llvm-shlib/CMakeLists.txt     |    1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/libclang/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/tools/libclang/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/libclang/CMakeLists.txt
-@@ -117,7 +117,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/libclang/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt
+@@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
      remove_definitions("-D_XOPEN_SOURCE=700")
  endif()
  
@@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/libc
    OUTPUT_NAME ${output_name}
    ${SOURCES}
  
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/tools/llvm-shlib/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt
 @@ -32,6 +32,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/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
index 13fcd38f..39c2ff05 100644
--- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
+++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
@@ -13,24 +13,24 @@ Subject: Use Debian-provided MathJax everywhere.
  polly/docs/doxygen.cfg.in             | 2 +-
  8 files changed, 14 insertions(+), 5 deletions(-)
 
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py
-@@ -119,6 +119,9 @@ html_theme = 'haiku'
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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']
+ html_static_path = ["_static"]
  
 +# Use Debian-provided MathJax
 +mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
 +
  # 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_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/doxygen.cfg.in
+ # html_last_updated_fmt = '%b %d, %Y'
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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,11 +40,11 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/clang/docs/analyzer/conf.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/analyzer/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/analyzer/conf.py
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/analyzer/conf.py
-@@ -120,6 +120,9 @@ html_theme = 'haiku'
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/analyzer/conf.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/analyzer/conf.py
+@@ -120,6 +120,9 @@ html_theme = "haiku"
  # so a file named "default.css" will overwrite the builtin "default.css".
  html_static_path = ['_static']
  
@@ -53,12 +53,12 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/clang/docs/conf.py
+ # html_last_updated_fmt = '%b %d, %Y'
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py
-@@ -134,6 +134,9 @@ html_theme = 'haiku'
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py
+@@ -135,6 +135,9 @@ html_theme = "haiku"
  # so a file named "default.css" will overwrite the builtin "default.css".
  html_static_path = ['_static']
  
@@ -67,11 +67,11 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/clang/docs/doxygen.cfg.in
+ # html_last_updated_fmt = '%b %d, %Y'
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/llvm/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/polly/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/polly/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/polly/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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/clang-format-version.diff b/debian/patches/clang-format-version.diff
index 5ea4a162..f2719282 100644
--- a/debian/patches/clang-format-version.diff
+++ b/debian/patches/clang-format-version.diff
@@ -4,23 +4,23 @@
  clang/tools/clang-format/clang-format.py      |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format-diff.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/tools/clang-format/clang-format-diff.py
-+++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format-diff.py
-@@ -63,7 +63,7 @@ def main():
-                       'fallback in case clang-format is invoked with'
-                       '-style=file, but can not find the .clang-format'
-                       'file to use.')
--  parser.add_argument('-binary', default='clang-format',
-+  parser.add_argument('-binary', default='clang-format-17',
-                       help='location of binary to use for clang-format')
-   args = parser.parse_args()
- 
-Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.el
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format-diff.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format-diff.py
+@@ -92,7 +92,7 @@ def main():
+     )
+     parser.add_argument(
+         "-binary",
+-        default="clang-format",
++        default="clang-format-17",
+         help="location of binary to use for clang-format",
+     )
+     args = parser.parse_args()
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.el
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/tools/clang-format/clang-format.el
-+++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.el
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format.el
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.el
 @@ -37,7 +37,7 @@
    :group 'tools)
  
@@ -30,16 +30,16 @@ Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clan
        "clang-format")
    "Location of the clang-format executable.
  
-Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/tools/clang-format/clang-format.py
-+++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.py
 @@ -49,7 +49,7 @@ import vim
  
  # set g:clang_format_path to the path to clang-format if it is not on the path
  # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = 'clang-format-17'
+-binary = "clang-format"
++binary = "clang-format-17"
  if vim.eval('exists("g:clang_format_path")') == "1":
-   binary = vim.eval('g:clang_format_path')
+     binary = vim.eval("g:clang_format_path")
  
diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff
index b45f7338..ed7637a4 100644
--- a/debian/patches/clang-tidy-run-bin.diff
+++ b/debian/patches/clang-tidy-run-bin.diff
@@ -1,15 +1,19 @@
-Index: llvm-toolchain-snapshot_17~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20220525112612+8919447c71ab.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-+++ llvm-toolchain-snapshot_17~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-@@ -225,8 +225,10 @@ def main():
-                       action='store_true', help='allow alpha checkers from '
-                                                 'clang-analyzer.')
-   parser.add_argument('-clang-tidy-binary', metavar='PATH',
-+                      default='clang-tidy-17',
-                       help='path to clang-tidy binary')
-   parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
-+                      default='clang-apply-replacements-17',
-                       help='path to clang-apply-replacements binary')
-   parser.add_argument('-checks', default=None,
-                       help='checks filter, when not specified, use clang-tidy '
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+@@ -256,10 +256,13 @@ def main():
+         help="allow alpha checkers from " "clang-analyzer.",
+     )
+     parser.add_argument(
+-        "-clang-tidy-binary", metavar="PATH", help="path to clang-tidy binary"
++        "-clang-tidy-binary", metavar="PATH",
++        default='clang-tidy-17',
++        help="path to clang-tidy binary"
+     )
+     parser.add_argument(
+         "-clang-apply-replacements-binary",
++        default='clang-apply-replacements-17',
+         metavar="PATH",
+         help="path to clang-apply-replacements binary",
+     )
diff --git a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff
index e8f51b28..4430c91c 100644
--- a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff
+++ b/debian/patches/compiler-rt/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_17~++20230517015648+0b6264738f3d/compiler-rt/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/CMakeLists.txt
-@@ -296,6 +296,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/CMakeLists.txt
+@@ -303,6 +303,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY
  
  include(config-ix)
  
diff --git a/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff b/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
index 7166eb5f..319053db 100644
--- a/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
+++ b/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
@@ -1,10 +1,10 @@
 fix builtins armhf default arch detection by adding the same armhf triple
 handling use for compiler-rt
-Index: llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e/compiler-rt/lib/builtins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e.orig/compiler-rt/lib/builtins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -29,6 +29,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/builtins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt
+@@ -36,6 +36,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
      load_llvm_config()
    endif()
    construct_compiler_rt_default_triple()
diff --git a/debian/patches/debug-jit-path.diff b/debian/patches/debug-jit-path.diff
index 65667490..7eedfb1a 100644
--- a/debian/patches/debug-jit-path.diff
+++ b/debian/patches/debug-jit-path.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
 ===================================================================
---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
-+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
-@@ -304,8 +304,8 @@ bool PerfJITEventListener::InitDebugging
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+@@ -303,8 +303,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/disable-path-test-failing.diff b/debian/patches/disable-path-test-failing.diff
index 4c5ff440..62c6e0b8 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_14~++20211105102832+020ca1747d6c/llvm/unittests/Support/Path.cpp
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/Support/Path.cpp
 ===================================================================
---- llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c.orig/llvm/unittests/Support/Path.cpp
-+++ llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/Support/Path.cpp
-@@ -677,7 +677,7 @@ protected:
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/unittests/Support/Path.cpp
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/Support/Path.cpp
+@@ -679,7 +679,7 @@ protected:
      sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
    }
  
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/S
  };
  
  TEST_F(FileSystemTest, Unique) {
-@@ -761,7 +761,8 @@ TEST_F(FileSystemTest, RealPath) {
+@@ -763,7 +763,8 @@ TEST_F(FileSystemTest, RealPath) {
  
    // This can fail if $HOME is not set and getpwuid fails.
    bool Result = llvm::sys::path::home_directory(HomeDir);
@@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/S
      checkSeparators(HomeDir);
      ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected));
      checkSeparators(Expected);
-@@ -770,6 +771,7 @@ TEST_F(FileSystemTest, RealPath) {
+@@ -772,6 +773,7 @@ TEST_F(FileSystemTest, RealPath) {
      ASSERT_NO_ERROR(fs::real_path("~/", Actual, true));
      EXPECT_EQ(Expected, Actual);
    }
diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff
index a1f0bb6a..53968f12 100644
--- a/debian/patches/force-sse2-compiler-rt.diff
+++ b/debian/patches/force-sse2-compiler-rt.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/builtins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/lib/builtins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -758,6 +758,12 @@ else ()
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/builtins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt
+@@ -765,6 +765,12 @@ else ()
      append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
    endif()
  
diff --git a/debian/patches/libclc-fix-prepare_builtins-rpath.diff b/debian/patches/libclc-fix-prepare_builtins-rpath.diff
index 61d684be..8ee965f8 100644
--- a/debian/patches/libclc-fix-prepare_builtins-rpath.diff
+++ b/debian/patches/libclc-fix-prepare_builtins-rpath.diff
@@ -1,10 +1,10 @@
 set rpath for prepare_builtins build utility to find correct stage2
 libs at runtime when executed as part of a build
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libclc/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libclc/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libclc/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libclc/CMakeLists.txt
-@@ -120,6 +120,9 @@ add_llvm_executable( prepare_builtins ut
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libclc/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libclc/CMakeLists.txt
+@@ -121,6 +121,9 @@ add_llvm_executable( prepare_builtins ut
  target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} )
  # These were not properly reported in early LLVM and we don't need them
  target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions )
diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff
index 363397be..3989a52c 100644
--- a/debian/patches/lldb/lldb-soname.diff
+++ b/debian/patches/lldb/lldb-soname.diff
@@ -2,11 +2,11 @@
  lldb/source/API/CMakeLists.txt |   14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-Index: llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284.orig/lldb/source/API/CMakeLists.txt
-+++ llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/CMakeLists.txt
-@@ -15,7 +15,12 @@ if(LLDB_ENABLE_LUA)
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/source/API/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/CMakeLists.txt
+@@ -20,7 +20,12 @@ if(LLDB_ENABLE_LUA)
    set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp)
  endif()
  
@@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/
    SBAddress.cpp
    SBAttachInfo.cpp
    SBBlock.cpp
-@@ -158,7 +163,7 @@ endif()
+@@ -164,7 +169,7 @@ endif()
  
  set_target_properties(liblldb
    PROPERTIES
@@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/
  )
  
  target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB)
-@@ -178,12 +183,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo
+@@ -184,12 +189,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo
    set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc")
  endif()
  
diff --git a/debian/patches/llvm-fix-lld-linker-check.diff b/debian/patches/llvm-fix-lld-linker-check.diff
index 2f4e7bfd..c96e02a6 100644
--- a/debian/patches/llvm-fix-lld-linker-check.diff
+++ b/debian/patches/llvm-fix-lld-linker-check.diff
@@ -1,10 +1,10 @@
 remove regex anchor in lld linker detection to account for vendor, if
 specified, being prepended to lld version string
-Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/AddLLVM.cmake
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddLLVM.cmake
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/llvm/cmake/modules/AddLLVM.cmake
-+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/AddLLVM.cmake
-@@ -217,7 +217,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED AND
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/cmake/modules/AddLLVM.cmake
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddLLVM.cmake
+@@ -233,7 +233,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED AND
        set(LLVM_LINKER_DETECTED YES CACHE INTERNAL "")
        set(LLVM_LINKER_IS_GOLD YES CACHE INTERNAL "")
        message(STATUS "Linker detection: GNU Gold")
diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff
index 4bc3c25c..1116fa9b 100644
--- a/debian/patches/lower-python-dep.diff
+++ b/debian/patches/lower-python-dep.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/CMakeLists.txt
-@@ -836,8 +836,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/CMakeLists.txt
+@@ -843,8 +843,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/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 13b4ba43..36a9ccfc 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/runtimes/CMakeLists.txt
 @@ -236,6 +236,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}
@@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/CMakeLists.txt
-@@ -94,6 +94,28 @@ else()
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/CMakeLists.txt
+@@ -101,6 +101,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
  
@@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -55,6 +55,8 @@ endif()
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -82,10 +82,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/src/CMakeLists.txt
 @@ -36,7 +36,9 @@ add_llvm_library(omptarget
    omp
  
@@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -112,11 +112,11 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/CMakeLists.txt
-@@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/src/CMakeLists.txt
+@@ -141,6 +141,7 @@ set_source_files_properties(${LIBOMP_GNU
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
    set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
@@ -124,7 +124,7 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/s
  else()
    set(LIBOMP_LINKER_LANGUAGE CXX)
  endif()
-@@ -200,6 +201,8 @@ else()
+@@ -202,6 +203,8 @@ else()
    )
  endif()
  
@@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)
diff --git a/debian/patches/openmp-soname.diff b/debian/patches/openmp-soname.diff
index dc33a6e5..f3188bce 100644
--- a/debian/patches/openmp-soname.diff
+++ b/debian/patches/openmp-soname.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/openmp/runtime/CMakeLists.txt
-@@ -371,7 +371,8 @@ else()
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt
+@@ -380,7 +380,8 @@ else()
    set(LIBOMP_INSTALL_KIND ARCHIVE)
  endif()
  
diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff
index 8f22a5d5..ce679260 100644
--- a/debian/patches/python-clangpath.diff
+++ b/debian/patches/python-clangpath.diff
@@ -2,16 +2,16 @@
  clang/bindings/python/clang/cindex.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/bindings/python/clang/cindex.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/clang/cindex.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/bindings/python/clang/cindex.py
-+++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/bindings/python/clang/cindex.py
-@@ -4172,7 +4172,7 @@ class Config(object):
-         elif name == 'Windows':
-             file = 'libclang.dll'
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/bindings/python/clang/cindex.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/clang/cindex.py
+@@ -3937,7 +3937,7 @@ class Config(object):
+         elif name == "Windows":
+             file = "libclang.dll"
          else:
--            file = 'libclang.so'
-+            file = 'libclang-17.so'
+-            file = "libclang.so"
++            file = "libclang-17.so"
  
          if Config.library_path:
-             file = Config.library_path + '/' + file
+             file = Config.library_path + "/" + file
diff --git a/debian/patches/python3-shebang.patch b/debian/patches/python3-shebang.patch
index e9353412..fa065a44 100644
--- a/debian/patches/python3-shebang.patch
+++ b/debian/patches/python3-shebang.patch
@@ -1,799 +1,799 @@
 Description: change all shebangs to Python3
  find . -name "*.py" -exec sed "s|\!/usr/bin/env python$|\!/usr/bin/env python3|g" -i {} \;
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
- #=- run-find-all-symbols.py - Parallel find-all-symbols runner -*- python  -*-=#
+ # =- run-find-all-symbols.py - Parallel find-all-symbols runner -*- python  -*-=#
  #
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
- #===- clang-tidy-diff.py - ClangTidy Diff Checker -----------*- python -*--===#
+ # ===- clang-tidy-diff.py - ClangTidy Diff Checker -----------*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/bindings/python/examples/cindex/cindex-dump.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/examples/cindex/cindex-dump.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/bindings/python/examples/cindex/cindex-dump.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/bindings/python/examples/cindex/cindex-dump.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/bindings/python/examples/cindex/cindex-dump.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/examples/cindex/cindex-dump.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
- #===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===#
+ # ===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/bindings/python/examples/cindex/cindex-includes.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/examples/cindex/cindex-includes.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/bindings/python/examples/cindex/cindex-includes.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/bindings/python/examples/cindex/cindex-includes.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/bindings/python/examples/cindex/cindex-includes.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/examples/cindex/cindex-includes.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
- #===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===#
+ # ===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/tools/scan-view/bin/scan-view
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-view/bin/scan-view
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/tools/scan-view/share/startfile.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-view/share/startfile.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/tools/scan-view/share/startfile.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/tools/scan-view/share/startfile.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/scan-view/share/startfile.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-view/share/startfile.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # -*- coding: utf-8 -*-
  
  """Utility for opening a file using the default application in a cross-platform
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/ABITest/ABITestGen.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/ABITest/ABITestGen.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/ABITest/ABITestGen.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/ABITest/ABITestGen.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/ABITest/ABITestGen.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/ABITest/ABITestGen.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  from pprint import pprint
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CIndex/completion_logger_server.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CIndex/completion_logger_server.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/CIndex/completion_logger_server.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CIndex/completion_logger_server.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/CIndex/completion_logger_server.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CIndex/completion_logger_server.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  from __future__ import absolute_import, division, print_function
  import sys
  from socket import *
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CaptureCmd
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CaptureCmd
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/CaptureCmd
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CaptureCmd
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/CaptureCmd
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CaptureCmd
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """CaptureCmd - A generic tool for capturing information about the
  invocations of another program.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CmpDriver
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CmpDriver
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/CmpDriver
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/CmpDriver
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/CmpDriver
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CmpDriver
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  A simple utility that compares tool invocations and exit codes issued by
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/FindSpecRefs
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/FindSpecRefs
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/FindSpecRefs
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/FindSpecRefs
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/FindSpecRefs
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/FindSpecRefs
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import re
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/FuzzTest
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/FuzzTest
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/FuzzTest
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/FuzzTest
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/FuzzTest
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/FuzzTest
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  This is a generic fuzz testing tool, see --help for more information.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/TestUtils/deep-stack.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/TestUtils/deep-stack.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/TestUtils/deep-stack.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/TestUtils/deep-stack.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/TestUtils/deep-stack.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/TestUtils/deep-stack.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
- def pcall(f, N):
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/CmpRuns.py
+ 
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/CmpRuns.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/CmpRuns.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/CmpRuns.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/CmpRuns.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/CmpRuns.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  CmpRuns - A simple tool for comparing two static analyzer runs to determine
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestAdd.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestAdd.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/SATestAdd.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestAdd.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/SATestAdd.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestAdd.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Static Analyzer qualification infrastructure: adding a new project to
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestBuild.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestBuild.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/SATestBuild.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestBuild.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/SATestBuild.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestBuild.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Static Analyzer qualification infrastructure.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestUpdateDiffs.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestUpdateDiffs.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/SATestUpdateDiffs.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SATestUpdateDiffs.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/SATestUpdateDiffs.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestUpdateDiffs.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Update reference results for static analyzer.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SumTimerInfo.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SumTimerInfo.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/SumTimerInfo.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/SumTimerInfo.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/SumTimerInfo.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SumTimerInfo.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Script to Summarize statistics in the scan-build output.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/exploded-graph-rewriter.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/exploded-graph-rewriter.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/analyzer/exploded-graph-rewriter.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/analyzer/exploded-graph-rewriter.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/exploded-graph-rewriter.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/exploded-graph-rewriter.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
- #===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--#
+ # ===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--#
  #
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/check_cfc.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/check_cfc.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/check_cfc/check_cfc.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/check_cfc.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/check_cfc/check_cfc.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/check_cfc.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Check CFC - Check Compile Flow Consistency
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/obj_diff.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/obj_diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/check_cfc/obj_diff.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/obj_diff.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/check_cfc/obj_diff.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/obj_diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/test_check_cfc.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/test_check_cfc.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/check_cfc/test_check_cfc.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/check_cfc/test_check_cfc.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/check_cfc/test_check_cfc.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/test_check_cfc.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Test internal functions within check_cfc.py."""
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/modfuzz.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/modfuzz.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/modfuzz.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/modfuzz.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/modfuzz.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/modfuzz.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # To use:
  #  1) Update the 'decls' list below with your fuzzing configuration.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/token-delta.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/token-delta.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/clang/utils/token-delta.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/clang/utils/token-delta.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/token-delta.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/token-delta.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  import os
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/asan/scripts/asan_symbolize.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/asan/scripts/asan_symbolize.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/asan/scripts/asan_symbolize.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/asan/scripts/asan_symbolize.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===- lib/asan/scripts/asan_symbolize.py -----------------------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===- lib/fuzzer/scripts/unbalanced_allocs.py ------------------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===- lib/sanitizer_common/scripts/gen_dynamic_list.py ---------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/sanitizer_common/scripts/sancov.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/sanitizer_common/scripts/sancov.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/compiler-rt/lib/sanitizer_common/scripts/sancov.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/sanitizer_common/scripts/sancov.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # Merge or print the coverage data collected by asan's coverage.
  # Input files are sequences of 4-byte integers.
  # We need to merge these integers into a set and then
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/cat_files.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/cat_files.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/libcxx/utils/cat_files.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/cat_files.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libcxx/utils/cat_files.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/cat_files.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===----------------------------------------------------------------------===##
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/generate_feature_test_macro_components.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/generate_feature_test_macro_components.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/libcxx/utils/generate_feature_test_macro_components.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/generate_feature_test_macro_components.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libcxx/utils/generate_feature_test_macro_components.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/generate_feature_test_macro_components.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  from builtins import range
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/sym_diff.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/sym_diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/libcxx/utils/sym_diff.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/libcxx/utils/sym_diff.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libcxx/utils/sym_diff.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/sym_diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #===----------------------------------------------------------------------===##
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lld/utils/benchmark.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/utils/benchmark.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lld/utils/benchmark.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lld/utils/benchmark.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lld/utils/benchmark.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/utils/benchmark.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  # See https://llvm.org/LICENSE.txt for license information.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/examples/python/file_extract.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/examples/python/file_extract.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/examples/python/file_extract.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/examples/python/file_extract.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/examples/python/file_extract.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/examples/python/file_extract.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import string
  import struct
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/packages/Python/lldbsuite/test/bench.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/packages/Python/lldbsuite/test/bench.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/packages/Python/lldbsuite/test/bench.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/packages/Python/lldbsuite/test/bench.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/packages/Python/lldbsuite/test/bench.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/packages/Python/lldbsuite/test/bench.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  A simple bench runner which delegates to the ./dotest.py test driver to run the
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import binascii
  import json
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/scripts/analyze-project-deps.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/scripts/analyze-project-deps.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/scripts/analyze-project-deps.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/scripts/analyze-project-deps.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/scripts/analyze-project-deps.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/scripts/analyze-project-deps.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import argparse
  import itertools
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/scripts/verify_api.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/scripts/verify_api.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/scripts/verify_api.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/scripts/verify_api.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/scripts/verify_api.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/scripts/verify_api.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import subprocess
  import optparse
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  '''This module implements a Finite State Machine (FSM). In addition to state
  this FSM also maintains a user defined "memory". So this FSM can be used as a
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/utils/lui/lui.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/utils/lui/lui.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/utils/lui/lui.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/utils/lui/lui.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/utils/lui/lui.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/utils/lui/lui.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  ##===-- lui.py -----------------------------------------------*- Python -*-===##
  ##
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/utils/lui/sandbox.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/utils/lui/sandbox.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/lldb/utils/lui/sandbox.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/lldb/utils/lui/sandbox.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/utils/lui/sandbox.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/utils/lui/sandbox.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  ##===-- sandbox.py -------------------------------------------*- Python -*-===##
  ##
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/BugPoint/compile-custom.ll.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/BugPoint/compile-custom.ll.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/test/BugPoint/compile-custom.ll.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/BugPoint/compile-custom.ll.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/test/BugPoint/compile-custom.ll.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/BugPoint/compile-custom.ll.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/Other/opt-bisect-helper.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/Other/opt-bisect-helper.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/test/Other/opt-bisect-helper.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/Other/opt-bisect-helper.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/test/Other/opt-bisect-helper.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/Other/opt-bisect-helper.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/TableGen/JSON-check.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/TableGen/JSON-check.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/test/TableGen/JSON-check.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/test/TableGen/JSON-check.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/test/TableGen/JSON-check.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/TableGen/JSON-check.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  import subprocess
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-diff.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/tools/opt-viewer/opt-diff.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-diff.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/opt-viewer/opt-diff.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-stats.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-stats.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/tools/opt-viewer/opt-stats.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-stats.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/opt-viewer/opt-stats.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-stats.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-viewer.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-viewer.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/tools/opt-viewer/opt-viewer.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/opt-viewer.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/opt-viewer/opt-viewer.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-viewer.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/optrecord.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/optrecord.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/tools/opt-viewer/optrecord.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/tools/opt-viewer/optrecord.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/opt-viewer/optrecord.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/optrecord.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/Misc/zkill
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/Misc/zkill
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/Misc/zkill
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/Misc/zkill
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/Misc/zkill
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/Misc/zkill
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import re
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/abtest.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/abtest.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/abtest.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/abtest.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/abtest.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/abtest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # Given a previous good compile narrow down miscompiles.
  # Expects two directories named "before" and "after" each containing a set of
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bisect
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bisect
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/bisect
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bisect
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/bisect
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bisect
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # The way you use this is you create a script that takes in as its first
  # argument a count. The script passes into LLVM the count via a command
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bisect-skip-count
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bisect-skip-count
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/bisect-skip-count
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bisect-skip-count
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/bisect-skip-count
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bisect-skip-count
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # This script is used to bisect skip and count arguments for --debug-counter.
  # It is similar to bisect, except it understands how to increase skip and decrease count
  #
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bugpoint_gisel_reducer.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bugpoint_gisel_reducer.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/bugpoint_gisel_reducer.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/bugpoint_gisel_reducer.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/bugpoint_gisel_reducer.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bugpoint_gisel_reducer.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Reduces GlobalISel failures.
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/clang-parse-diagnostics-file
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/clang-parse-diagnostics-file
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/clang-parse-diagnostics-file
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/clang-parse-diagnostics-file
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/clang-parse-diagnostics-file
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/clang-parse-diagnostics-file
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import plistlib
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/create_ladder_graph.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/create_ladder_graph.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/create_ladder_graph.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/create_ladder_graph.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/create_ladder_graph.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/create_ladder_graph.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """A ladder graph creation program.
  
  This is a python program that creates c source code that will generate
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/extract_symbols.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/extract_symbols.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/extract_symbols.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/extract_symbols.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/extract_symbols.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/extract_symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A tool for extracting a list of symbols to export
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/extract_vplan.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/extract_vplan.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/extract_vplan.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/extract_vplan.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/extract_vplan.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/extract_vplan.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # This script extracts the VPlan digraphs from the vectoriser debug messages
  # and saves them in individual dot files (one for each plan). Optionally, and
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/indirect_calls.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/indirect_calls.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/indirect_calls.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/indirect_calls.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/indirect_calls.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/indirect_calls.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A tool for looking for indirect jumps and calls in x86 binaries.
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/lit/ProgressBar.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/lit/ProgressBar.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/lit/ProgressBar.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/lit/ProgressBar.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/lit/ProgressBar.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/lit/ProgressBar.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # Source: http://code.activestate.com/recipes/475116/, with
  # modifications by Daniel Dunbar.
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import sys
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import sys
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  import os
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import argparse
  import platform
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/llvm-gisel-cov.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/llvm-gisel-cov.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/llvm-gisel-cov.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/llvm-gisel-cov.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/llvm-gisel-cov.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/llvm-gisel-cov.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """
  Summarize the information in the given coverage files.
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/prepare-code-coverage-artifact.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/prepare-code-coverage-artifact.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/prepare-code-coverage-artifact.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/prepare-code-coverage-artifact.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/prepare-code-coverage-artifact.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/prepare-code-coverage-artifact.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/release/findRegressions-nightly.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/release/findRegressions-nightly.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/release/findRegressions-nightly.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/release/findRegressions-nightly.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/release/findRegressions-nightly.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/release/findRegressions-nightly.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  from __future__ import print_function
  
  import re, string, sys, os, time
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/release/findRegressions-simple.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/release/findRegressions-simple.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/release/findRegressions-simple.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/release/findRegressions-simple.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/release/findRegressions-simple.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/release/findRegressions-simple.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  import re, string, sys, os, time, math
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/shuffle_fuzz.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/shuffle_fuzz.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/shuffle_fuzz.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/shuffle_fuzz.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/shuffle_fuzz.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/shuffle_fuzz.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A shuffle vector fuzz tester.
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/shuffle_select_fuzz_tester.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/shuffle_select_fuzz_tester.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/shuffle_select_fuzz_tester.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/shuffle_select_fuzz_tester.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/shuffle_select_fuzz_tester.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/shuffle_select_fuzz_tester.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A shuffle-select vector fuzz tester.
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/sort_includes.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/sort_includes.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/sort_includes.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/sort_includes.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/sort_includes.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/sort_includes.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Script to sort the top-most block of #include lines.
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/unicode-case-fold.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/unicode-case-fold.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/unicode-case-fold.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/unicode-case-fold.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/unicode-case-fold.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/unicode-case-fold.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """
  Unicode case folding database conversion utility
  
-Index: llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/wciia.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/wciia.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a.orig/llvm/utils/wciia.py
-+++ llvm-toolchain-snapshot_17~++20230211120401+2979070f1b3a/llvm/utils/wciia.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/wciia.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/wciia.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
diff --git a/debian/patches/revert-update-doc.diff b/debian/patches/revert-update-doc.diff
index 6a29aa65..77b6d573 100644
--- a/debian/patches/revert-update-doc.diff
+++ b/debian/patches/revert-update-doc.diff
@@ -15,13 +15,13 @@ Date:   Tue Feb 1 23:13:01 2022 -0800
     
     Differential Revision: https://reviews.llvm.org/D112181
 
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py
-@@ -44,6 +44,15 @@ master_doc = 'index'
- project = u'Extra Clang Tools'
- copyright = u'2007-%d, The Clang Team' % date.today().year
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py
+@@ -44,6 +44,15 @@ master_doc = "index"
+ project = "Extra Clang Tools"
+ copyright = "2007-%d, The Clang Team" % date.today().year
  
 +# The version info for the project you're documenting, acts as replacement for
 +# |version| and |release|, also used in various other places throughout the
@@ -34,10 +34,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extr
 +
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
- #language = None
-@@ -78,11 +87,6 @@ pygments_style = 'friendly'
+ # language = None
+@@ -78,11 +87,6 @@ pygments_style = "friendly"
  # A list of ignored prefixes for module index sorting.
- #modindex_common_prefix = []
+ # modindex_common_prefix = []
  
 -in_progress_title = "(In-Progress) " if tags.has("PreRelease") else ""
 -
@@ -47,13 +47,13 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extr
  
  # -- Options for HTML output ---------------------------------------------------
  
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py
-@@ -62,6 +62,15 @@ master_doc = 'index'
- project = u'Clang'
- copyright = u'2007-%d, The Clang Team' % date.today().year
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py
+@@ -63,6 +63,15 @@ master_doc = "index"
+ project = "Clang"
+ copyright = "2007-%d, The Clang Team" % date.today().year
  
 +# The version info for the project you're documenting, acts as replacement for
 +# |version| and |release|, also used in various other places throughout the
@@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.
 +
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
- #language = None
-@@ -93,11 +102,6 @@ exclude_patterns = ['_build']
+ # language = None
+@@ -94,11 +103,6 @@ exclude_patterns = ["_build"]
  # The name of the Pygments (syntax highlighting) style to use.
- pygments_style = 'friendly'
+ pygments_style = "friendly"
  
 -in_progress_title = "(In-Progress) " if tags.has("PreRelease") else ""
 -
@@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.
  
  # -- Options for HTML output ---------------------------------------------------
  
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lld/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lld/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lld/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lld/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/docs/conf.py
 @@ -43,6 +43,15 @@ master_doc = 'index'
  project = u'lld'
  copyright = u'2011-%d, LLVM Project' % date.today().year
@@ -99,10 +99,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lld/docs/conf.py
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
  #language = None
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/cmake/modules/AddSphinxTarget.cmake
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddSphinxTarget.cmake
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/cmake/modules/AddSphinxTarget.cmake
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/cmake/modules/AddSphinxTarget.cmake
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/cmake/modules/AddSphinxTarget.cmake
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddSphinxTarget.cmake
 @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj
      set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
    endif()
@@ -124,10 +124,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/cmake/modul
                              ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested
                              "${ARG_SOURCE_DIR}" # Source
                              "${SPHINX_BUILD_DIR}" # Output
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/conf.py
 @@ -62,6 +62,15 @@ master_doc = "index"
  project = "LLVM"
  copyright = "2003-%d, LLVM Project" % date.today().year
@@ -144,10 +144,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/conf.p
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
  # language = None
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/polly/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/polly/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/conf.py
 @@ -44,6 +44,15 @@ master_doc = 'index'
  project = u'Polly'
  copyright = u'2010-%d, The Polly Team' % date.today().year
diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff
index 8a433d6c..d2a3742d 100644
--- a/debian/patches/scan-build-py-fix-default-bin.diff
+++ b/debian/patches/scan-build-py-fix-default-bin.diff
@@ -1,13 +1,13 @@
-Index: llvm-toolchain-snapshot_17~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20210717105643+f95d26006e06.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
-+++ llvm-toolchain-snapshot_17~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
-@@ -266,7 +266,7 @@ def create_analyze_parser(from_build_com
-         '--use-analyzer',
-         metavar='<path>',
-         dest='clang',
--        default='clang',
-+        default='clang-17',
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
+@@ -293,7 +293,7 @@ def create_analyze_parser(from_build_com
+         "--use-analyzer",
+         metavar="<path>",
+         dest="clang",
+-        default="clang",
++        default="clang-17",
          help="""'%(prog)s' uses the 'clang' executable relative to itself for
          static analysis. One can override this behavior with this option by
-         using the 'clang' packaged with Xcode (on OS X) or from the PATH.""")
+         using the 'clang' packaged with Xcode (on OS X) or from the PATH.""",
diff --git a/debian/patches/unwind-force-pthread-dl.diff b/debian/patches/unwind-force-pthread-dl.diff
index 5002aa2f..08111df4 100644
--- a/debian/patches/unwind-force-pthread-dl.diff
+++ b/debian/patches/unwind-force-pthread-dl.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libunwind/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libunwind/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libunwind/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libunwind/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libunwind/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libunwind/CMakeLists.txt
 @@ -277,14 +277,17 @@ if (MSVC)
    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
  endif()
diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff
index 6587c1bd..22ac2eea 100644
--- a/debian/patches/wasm/wasm-sysroot-usr.diff
+++ b/debian/patches/wasm/wasm-sysroot-usr.diff
@@ -1,5 +1,7 @@
---- a/clang/lib/Driver/ToolChains/WebAssembly.cpp
-+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.cpp
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.cpp
 @@ -174,7 +174,7 @@ WebAssembly::WebAssembly(const Driver &D
  
    getProgramPaths().push_back(getDriver().getInstalledDir());
@@ -17,7 +19,9 @@
  
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
      SmallString<128> P(D.ResourceDir);
-@@ -427,10 +428,18 @@ void WebAssembly::AddClangSystemIncludeA
+@@ -425,12 +426,20 @@ void WebAssembly::AddClangSystemIncludeA
+     return;
+   }
  
 +  // add the multiarch path on e.g. wasm32-wasi
    if (getTriple().getOS() != llvm::Triple::UnknownOS) {
@@ -39,7 +43,7 @@
  }
  
  void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
-@@ -478,6 +479,17 @@ Tool *WebAssembly::buildLinker() const {
+@@ -481,6 +490,17 @@ Tool *WebAssembly::buildLinker() const {
    return new tools::wasm::Linker(*this);
  }
  
@@ -57,7 +61,7 @@
  void WebAssembly::addLibCxxIncludePaths(
      const llvm::opt::ArgList &DriverArgs,
      llvm::opt::ArgStringList &CC1Args) const {
-@@ -499,7 +519,9 @@ void WebAssembly::addLibCxxIncludePaths(
+@@ -502,7 +522,9 @@ void WebAssembly::addLibCxxIncludePaths(
    }
  
    // Second add the generic one.
@@ -68,7 +72,7 @@
  }
  
  void WebAssembly::addLibStdCXXIncludePaths(
-@@ -546,8 +568,11 @@ void WebAssembly::addLibStdCXXIncludePat
+@@ -549,8 +571,11 @@ void WebAssembly::addLibStdCXXIncludePat
      addSystemInclude(DriverArgs, CC1Args, TargetDir);
    }
  
@@ -84,8 +88,10 @@
 +    addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
 +  }
  }
---- a/clang/lib/Driver/ToolChains/WebAssembly.h
-+++ b/clang/lib/Driver/ToolChains/WebAssembly.h
+Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/lib/Driver/ToolChains/WebAssembly.h
++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.h
 @@ -89,6 +89,8 @@ private:
                               llvm::opt::ArgStringList &CC1Args) const;
    void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs,

From f0cf0f7abfa9161d45bdf9664c5f07e45ce451ee Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 26 May 2023 08:24:19 +0200
Subject: [PATCH 065/349] rebase of the patches

---
 debian/patches/python3-shebang.patch  | 492 +++++++++++++-------------
 debian/patches/revert-update-doc.diff |  56 +--
 2 files changed, 269 insertions(+), 279 deletions(-)

diff --git a/debian/patches/python3-shebang.patch b/debian/patches/python3-shebang.patch
index fa065a44..31491534 100644
--- a/debian/patches/python3-shebang.patch
+++ b/debian/patches/python3-shebang.patch
@@ -1,799 +1,789 @@
 Description: change all shebangs to Python3
  find . -name "*.py" -exec sed "s|\!/usr/bin/env python$|\!/usr/bin/env python3|g" -i {} \;
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # =- run-find-all-symbols.py - Parallel find-all-symbols runner -*- python  -*-=#
  #
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # ===- clang-tidy-diff.py - ClangTidy Diff Checker -----------*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/examples/cindex/cindex-dump.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/bindings/python/examples/cindex/cindex-dump.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/bindings/python/examples/cindex/cindex-dump.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/examples/cindex/cindex-dump.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/bindings/python/examples/cindex/cindex-dump.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/bindings/python/examples/cindex/cindex-dump.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # ===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/examples/cindex/cindex-includes.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/bindings/python/examples/cindex/cindex-includes.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/bindings/python/examples/cindex/cindex-includes.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/examples/cindex/cindex-includes.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/bindings/python/examples/cindex/cindex-includes.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/bindings/python/examples/cindex/cindex-includes.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # ===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-view/bin/scan-view
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/tools/scan-view/bin/scan-view
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-view/share/startfile.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/tools/scan-view/share/startfile.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/scan-view/share/startfile.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-view/share/startfile.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/tools/scan-view/share/startfile.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/tools/scan-view/share/startfile.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # -*- coding: utf-8 -*-
  
  """Utility for opening a file using the default application in a cross-platform
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/ABITest/ABITestGen.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/ABITest/ABITestGen.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/ABITest/ABITestGen.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/ABITest/ABITestGen.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/ABITest/ABITestGen.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/ABITest/ABITestGen.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  from pprint import pprint
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CIndex/completion_logger_server.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CIndex/completion_logger_server.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/CIndex/completion_logger_server.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CIndex/completion_logger_server.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/CIndex/completion_logger_server.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CIndex/completion_logger_server.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  from __future__ import absolute_import, division, print_function
  import sys
  from socket import *
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CaptureCmd
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CaptureCmd
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/CaptureCmd
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CaptureCmd
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/CaptureCmd
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CaptureCmd
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """CaptureCmd - A generic tool for capturing information about the
  invocations of another program.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CmpDriver
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CmpDriver
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/CmpDriver
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/CmpDriver
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/CmpDriver
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CmpDriver
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  A simple utility that compares tool invocations and exit codes issued by
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/FindSpecRefs
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/FindSpecRefs
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/FindSpecRefs
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/FindSpecRefs
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/FindSpecRefs
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/FindSpecRefs
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import re
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/FuzzTest
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/FuzzTest
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/FuzzTest
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/FuzzTest
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/FuzzTest
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/FuzzTest
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  This is a generic fuzz testing tool, see --help for more information.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/TestUtils/deep-stack.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/TestUtils/deep-stack.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/TestUtils/deep-stack.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/TestUtils/deep-stack.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/TestUtils/deep-stack.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/TestUtils/deep-stack.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/CmpRuns.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/CmpRuns.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/CmpRuns.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/CmpRuns.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/CmpRuns.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/CmpRuns.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  CmpRuns - A simple tool for comparing two static analyzer runs to determine
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestAdd.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestAdd.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/SATestAdd.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestAdd.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/SATestAdd.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestAdd.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Static Analyzer qualification infrastructure: adding a new project to
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestBuild.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestBuild.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/SATestBuild.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestBuild.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/SATestBuild.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestBuild.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Static Analyzer qualification infrastructure.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestUpdateDiffs.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestUpdateDiffs.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/SATestUpdateDiffs.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SATestUpdateDiffs.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/SATestUpdateDiffs.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestUpdateDiffs.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Update reference results for static analyzer.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SumTimerInfo.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SumTimerInfo.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/SumTimerInfo.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/SumTimerInfo.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/SumTimerInfo.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SumTimerInfo.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Script to Summarize statistics in the scan-build output.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/exploded-graph-rewriter.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/exploded-graph-rewriter.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/analyzer/exploded-graph-rewriter.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/analyzer/exploded-graph-rewriter.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/exploded-graph-rewriter.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/exploded-graph-rewriter.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # ===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--#
  #
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/check_cfc.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/check_cfc.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/check_cfc/check_cfc.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/check_cfc.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/check_cfc/check_cfc.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/check_cfc.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Check CFC - Check Compile Flow Consistency
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/obj_diff.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/obj_diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/check_cfc/obj_diff.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/obj_diff.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/check_cfc/obj_diff.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/obj_diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/test_check_cfc.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/test_check_cfc.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/check_cfc/test_check_cfc.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/check_cfc/test_check_cfc.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/check_cfc/test_check_cfc.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/test_check_cfc.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Test internal functions within check_cfc.py."""
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/modfuzz.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/modfuzz.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/modfuzz.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/modfuzz.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/modfuzz.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/modfuzz.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # To use:
  #  1) Update the 'decls' list below with your fuzzing configuration.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/token-delta.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/token-delta.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/utils/token-delta.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/utils/token-delta.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/token-delta.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/token-delta.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  import os
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/asan/scripts/asan_symbolize.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/asan/scripts/asan_symbolize.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/asan/scripts/asan_symbolize.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/asan/scripts/asan_symbolize.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- #===- lib/asan/scripts/asan_symbolize.py -----------------------------------===#
+ # ===- lib/asan/scripts/asan_symbolize.py -----------------------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- #===- lib/fuzzer/scripts/unbalanced_allocs.py ------------------------------===#
+ # ===- lib/fuzzer/scripts/unbalanced_allocs.py ------------------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- #===- lib/sanitizer_common/scripts/gen_dynamic_list.py ---------------------===#
+ # ===- lib/sanitizer_common/scripts/gen_dynamic_list.py ---------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/sanitizer_common/scripts/sancov.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/sanitizer_common/scripts/sancov.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/sanitizer_common/scripts/sancov.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/sanitizer_common/scripts/sancov.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # Merge or print the coverage data collected by asan's coverage.
  # Input files are sequences of 4-byte integers.
  # We need to merge these integers into a set and then
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/cat_files.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/libcxx/utils/cat_files.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libcxx/utils/cat_files.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/cat_files.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/libcxx/utils/cat_files.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/libcxx/utils/cat_files.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- #===----------------------------------------------------------------------===##
+ # ===----------------------------------------------------------------------===##
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/generate_feature_test_macro_components.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/libcxx/utils/generate_feature_test_macro_components.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libcxx/utils/generate_feature_test_macro_components.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/generate_feature_test_macro_components.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/libcxx/utils/generate_feature_test_macro_components.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/libcxx/utils/generate_feature_test_macro_components.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  from builtins import range
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/sym_diff.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/utils/benchmark.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libcxx/utils/sym_diff.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libcxx/utils/sym_diff.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #===----------------------------------------------------------------------===##
- #
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/utils/benchmark.py
-===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lld/utils/benchmark.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/utils/benchmark.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lld/utils/benchmark.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/utils/benchmark.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  # See https://llvm.org/LICENSE.txt for license information.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/examples/python/file_extract.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/examples/python/file_extract.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/examples/python/file_extract.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/examples/python/file_extract.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/examples/python/file_extract.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/examples/python/file_extract.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import string
  import struct
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/packages/Python/lldbsuite/test/bench.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/packages/Python/lldbsuite/test/bench.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/packages/Python/lldbsuite/test/bench.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/packages/Python/lldbsuite/test/bench.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/packages/Python/lldbsuite/test/bench.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/packages/Python/lldbsuite/test/bench.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  A simple bench runner which delegates to the ./dotest.py test driver to run the
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import binascii
  import json
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/scripts/analyze-project-deps.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/scripts/analyze-project-deps.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/scripts/analyze-project-deps.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/scripts/analyze-project-deps.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/scripts/analyze-project-deps.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/scripts/analyze-project-deps.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import argparse
  import itertools
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/scripts/verify_api.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/scripts/verify_api.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/scripts/verify_api.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/scripts/verify_api.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/scripts/verify_api.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/scripts/verify_api.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import subprocess
  import optparse
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  '''This module implements a Finite State Machine (FSM). In addition to state
  this FSM also maintains a user defined "memory". So this FSM can be used as a
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/utils/lui/lui.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/utils/lui/lui.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/utils/lui/lui.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/utils/lui/lui.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/utils/lui/lui.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/utils/lui/lui.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  ##===-- lui.py -----------------------------------------------*- Python -*-===##
  ##
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/utils/lui/sandbox.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/utils/lui/sandbox.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/utils/lui/sandbox.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/utils/lui/sandbox.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/utils/lui/sandbox.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/utils/lui/sandbox.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  ##===-- sandbox.py -------------------------------------------*- Python -*-===##
  ##
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/BugPoint/compile-custom.ll.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/BugPoint/compile-custom.ll.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/test/BugPoint/compile-custom.ll.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/BugPoint/compile-custom.ll.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/test/BugPoint/compile-custom.ll.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/BugPoint/compile-custom.ll.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/Other/opt-bisect-helper.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/Other/opt-bisect-helper.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/test/Other/opt-bisect-helper.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/Other/opt-bisect-helper.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/test/Other/opt-bisect-helper.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/Other/opt-bisect-helper.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/TableGen/JSON-check.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/TableGen/JSON-check.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/test/TableGen/JSON-check.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/test/TableGen/JSON-check.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/test/TableGen/JSON-check.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/TableGen/JSON-check.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  import subprocess
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-diff.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/opt-viewer/opt-diff.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-diff.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/tools/opt-viewer/opt-diff.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-stats.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-stats.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/opt-viewer/opt-stats.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-stats.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/tools/opt-viewer/opt-stats.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-stats.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-viewer.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-viewer.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/opt-viewer/opt-viewer.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/opt-viewer.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/tools/opt-viewer/opt-viewer.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-viewer.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/optrecord.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/optrecord.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/opt-viewer/optrecord.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/opt-viewer/optrecord.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/tools/opt-viewer/optrecord.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/optrecord.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/Misc/zkill
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/Misc/zkill
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/Misc/zkill
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/Misc/zkill
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/Misc/zkill
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/Misc/zkill
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import re
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/abtest.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/abtest.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/abtest.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/abtest.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/abtest.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/abtest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # Given a previous good compile narrow down miscompiles.
  # Expects two directories named "before" and "after" each containing a set of
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bisect
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bisect
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/bisect
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bisect
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/bisect
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bisect
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # The way you use this is you create a script that takes in as its first
  # argument a count. The script passes into LLVM the count via a command
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bisect-skip-count
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bisect-skip-count
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/bisect-skip-count
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bisect-skip-count
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/bisect-skip-count
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bisect-skip-count
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # This script is used to bisect skip and count arguments for --debug-counter.
  # It is similar to bisect, except it understands how to increase skip and decrease count
  #
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bugpoint_gisel_reducer.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bugpoint_gisel_reducer.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/bugpoint_gisel_reducer.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/bugpoint_gisel_reducer.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/bugpoint_gisel_reducer.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bugpoint_gisel_reducer.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Reduces GlobalISel failures.
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/clang-parse-diagnostics-file
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/clang-parse-diagnostics-file
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/clang-parse-diagnostics-file
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/clang-parse-diagnostics-file
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/clang-parse-diagnostics-file
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/clang-parse-diagnostics-file
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import plistlib
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/create_ladder_graph.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/create_ladder_graph.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/create_ladder_graph.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/create_ladder_graph.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/create_ladder_graph.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/create_ladder_graph.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """A ladder graph creation program.
  
  This is a python program that creates c source code that will generate
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/extract_symbols.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/extract_symbols.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/extract_symbols.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/extract_symbols.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/extract_symbols.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/extract_symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A tool for extracting a list of symbols to export
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/extract_vplan.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/extract_vplan.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/extract_vplan.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/extract_vplan.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/extract_vplan.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/extract_vplan.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # This script extracts the VPlan digraphs from the vectoriser debug messages
  # and saves them in individual dot files (one for each plan). Optionally, and
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/indirect_calls.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/indirect_calls.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/indirect_calls.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/indirect_calls.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/indirect_calls.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/indirect_calls.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A tool for looking for indirect jumps and calls in x86 binaries.
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/lit/ProgressBar.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/lit/ProgressBar.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/lit/ProgressBar.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/lit/ProgressBar.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/lit/ProgressBar.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/lit/ProgressBar.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # Source: http://code.activestate.com/recipes/475116/, with
  # modifications by Daniel Dunbar.
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import sys
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import sys
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  import os
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import argparse
  import platform
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/llvm-gisel-cov.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/llvm-gisel-cov.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/llvm-gisel-cov.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/llvm-gisel-cov.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/llvm-gisel-cov.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/llvm-gisel-cov.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """
  Summarize the information in the given coverage files.
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/prepare-code-coverage-artifact.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/prepare-code-coverage-artifact.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/prepare-code-coverage-artifact.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/prepare-code-coverage-artifact.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/prepare-code-coverage-artifact.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/prepare-code-coverage-artifact.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/release/findRegressions-nightly.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/release/findRegressions-nightly.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/release/findRegressions-nightly.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/release/findRegressions-nightly.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/release/findRegressions-nightly.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/release/findRegressions-nightly.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  from __future__ import print_function
  
  import re, string, sys, os, time
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/release/findRegressions-simple.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/release/findRegressions-simple.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/release/findRegressions-simple.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/release/findRegressions-simple.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/release/findRegressions-simple.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/release/findRegressions-simple.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  import re, string, sys, os, time, math
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/shuffle_fuzz.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/shuffle_fuzz.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/shuffle_fuzz.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/shuffle_fuzz.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/shuffle_fuzz.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/shuffle_fuzz.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A shuffle vector fuzz tester.
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/shuffle_select_fuzz_tester.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/shuffle_select_fuzz_tester.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/shuffle_select_fuzz_tester.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/shuffle_select_fuzz_tester.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/shuffle_select_fuzz_tester.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/shuffle_select_fuzz_tester.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A shuffle-select vector fuzz tester.
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/sort_includes.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/sort_includes.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/sort_includes.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/sort_includes.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/sort_includes.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/sort_includes.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Script to sort the top-most block of #include lines.
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/unicode-case-fold.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/unicode-case-fold.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/unicode-case-fold.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/unicode-case-fold.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/unicode-case-fold.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/unicode-case-fold.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """
  Unicode case folding database conversion utility
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/wciia.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/wciia.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/utils/wciia.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/utils/wciia.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/wciia.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/wciia.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
diff --git a/debian/patches/revert-update-doc.diff b/debian/patches/revert-update-doc.diff
index 77b6d573..78cb249f 100644
--- a/debian/patches/revert-update-doc.diff
+++ b/debian/patches/revert-update-doc.diff
@@ -15,10 +15,10 @@ Date:   Tue Feb 1 23:13:01 2022 -0800
     
     Differential Revision: https://reviews.llvm.org/D112181
 
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang-tools-extra/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/docs/conf.py
 @@ -44,6 +44,15 @@ master_doc = "index"
  project = "Extra Clang Tools"
  copyright = "2007-%d, The Clang Team" % date.today().year
@@ -47,10 +47,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extr
  
  # -- Options for HTML output ---------------------------------------------------
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf.py
 @@ -63,6 +63,15 @@ master_doc = "index"
  project = "Clang"
  copyright = "2007-%d, The Clang Team" % date.today().year
@@ -79,13 +79,13 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.
  
  # -- Options for HTML output ---------------------------------------------------
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lld/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/docs/conf.py
-@@ -43,6 +43,15 @@ master_doc = 'index'
- project = u'lld'
- copyright = u'2011-%d, LLVM Project' % date.today().year
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lld/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/docs/conf.py
+@@ -43,6 +43,15 @@ master_doc = "index"
+ project = "lld"
+ copyright = "2011-%d, LLVM Project" % date.today().year
  
 +# The version info for the project you're documenting, acts as replacement for
 +# |version| and |release|, also used in various other places throughout the
@@ -98,11 +98,11 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/docs/conf.py
 +
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
- #language = None
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddSphinxTarget.cmake
+ # language = None
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/cmake/modules/AddSphinxTarget.cmake
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/cmake/modules/AddSphinxTarget.cmake
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddSphinxTarget.cmake
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/cmake/modules/AddSphinxTarget.cmake
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/cmake/modules/AddSphinxTarget.cmake
 @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj
      set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
    endif()
@@ -124,10 +124,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modul
                              ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested
                              "${ARG_SOURCE_DIR}" # Source
                              "${SPHINX_BUILD_DIR}" # Output
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/conf.py
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/docs/conf.py
 @@ -62,6 +62,15 @@ master_doc = "index"
  project = "LLVM"
  copyright = "2003-%d, LLVM Project" % date.today().year
@@ -144,13 +144,13 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/conf.p
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
  # language = None
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/conf.py
+Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/polly/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/polly/docs/conf.py
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/conf.py
-@@ -44,6 +44,15 @@ master_doc = 'index'
- project = u'Polly'
- copyright = u'2010-%d, The Polly Team' % date.today().year
+--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/polly/docs/conf.py
++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/polly/docs/conf.py
+@@ -44,6 +44,15 @@ master_doc = "index"
+ project = "Polly"
+ copyright = "2010-%d, The Polly Team" % date.today().year
  
 +# The version info for the project you're documenting, acts as replacement for
 +# |version| and |release|, also used in various other places throughout the
@@ -163,10 +163,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/conf.
 +
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
- #language = None
-@@ -78,11 +87,6 @@ pygments_style = 'friendly'
+ # language = None
+@@ -78,11 +87,6 @@ pygments_style = "friendly"
  # A list of ignored prefixes for module index sorting.
- #modindex_common_prefix = []
+ # modindex_common_prefix = []
  
 -in_progress_title = "(In-Progress) " if tags.has("PreRelease") else ""
 -

From ccb259572e0b68e34589aa213803065b0ddd536e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 26 May 2023 14:46:13 +0200
Subject: [PATCH 066/349] try to disable the wa

---
 debian/patches/series | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/series b/debian/patches/series
index 372ab88a..5e2a23c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-mbstate_workaround_issue_62523.diff
+#mbstate_workaround_issue_62523.diff

From 988fdc9a1d2e72c1d196b6741307de50337f39f5 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 28 May 2023 01:09:21 +0200
Subject: [PATCH 067/349] bring the workaround

---
 debian/patches/series | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/series b/debian/patches/series
index 5e2a23c6..372ab88a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-#mbstate_workaround_issue_62523.diff
+mbstate_workaround_issue_62523.diff

From b02fef2c8ad27e9e32e100d3d79333b8674ad8f5 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 30 May 2023 13:39:49 +0200
Subject: [PATCH 068/349] mbstate: use workaround from usptream
 https://github.com/llvm/llvm-project/issues/62523\#issuecomment-1553863958

---
 .../mbstate_workaround_issue_62523.diff       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/patches/mbstate_workaround_issue_62523.diff b/debian/patches/mbstate_workaround_issue_62523.diff
index 3a64c3d7..32b52455 100644
--- a/debian/patches/mbstate_workaround_issue_62523.diff
+++ b/debian/patches/mbstate_workaround_issue_62523.diff
@@ -1,14 +1,17 @@
-Index: llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/libcxx/include/wchar.h
+Index: llvm-toolchain-snapshot_17~++20230530094321+b187215a44f7/libcxx/include/__mbstate_t.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55.orig/libcxx/include/wchar.h
-+++ llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/libcxx/include/wchar.h
-@@ -122,6 +122,8 @@ size_t wcsrtombs(char* restrict dst, con
- #define __CORRECT_ISO_CPP_WCHAR_H_PROTO
+--- llvm-toolchain-snapshot_17~++20230530094321+b187215a44f7.orig/libcxx/include/__mbstate_t.h
++++ llvm-toolchain-snapshot_17~++20230530094321+b187215a44f7/libcxx/include/__mbstate_t.h
+@@ -35,7 +35,11 @@
+ #  define __CORRECT_ISO_CPP_WCHAR_H_PROTO
  #endif
-
-+#define __DEFINED_mbstate_t
+ 
+-#if __has_include(<bits/types/mbstate_t.h>)
 +
- #  if __has_include_next(<wchar.h>)
- #    include_next <wchar.h>
- #  else
-
++#if __has_include(<bits/alltypes.h>)  // Probe for musl
++#define __NEED_mbstate_t  // Tell musl we need __mbstate_t (and nothing else)
++#include <bits/alltypes.h>
++#elif __has_include(<bits/types/mbstate_t.h>)
+ #   include <bits/types/mbstate_t.h> // works on most Unixes
+ #elif __has_include(<sys/_types/_mbstate_t.h>)
+ #   include <sys/_types/_mbstate_t.h> // works on Darwin

From 9504789f3f0dc6f983c24b193c65a90ac015fb32 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 30 May 2023 21:41:57 +0200
Subject: [PATCH 069/349] remove some mlir example (libMyExtensionCh*.a)

---
 debian/changelog | 1 +
 debian/rules     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f8cab306..3c4ff077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ llvm-toolchain-snapshot (1:17~++20230517015648+0b6264738f3d-1~exp1) experimental
     https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225
   * New snapshot release
   * Yet a new element (omp) to disable in cmake detection. Upstream #62622
+  * remove some mlir example (libMyExtensionCh*.a)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 17 May 2023 13:20:42 +0200
 
diff --git a/debian/rules b/debian/rules
index ffc034e0..04ef6071 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1203,6 +1203,9 @@ endif
 		touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
 	fi
 
+# Remove some mlir example
+	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libMyExtensionCh*.a
+
 # Delete the target build directory to save some space on the build systems
 # All the files have been installed in $(CURDIR)/debian/tmp/ already
 	rm -rf $(TARGET_BUILD)

From 09237db7e0525b9576442a476874c4d14919cc97 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 30 May 2023 23:14:15 +0200
Subject: [PATCH 070/349] fix changelog

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c4ff077..77478a9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-snapshot (1:17~++20230517015648+0b6264738f3d-1~exp1) experimental; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230530111226+43bec3376c07-1~exp1) experimental; urgency=medium
 
   * llvm-debuginfod not installed anymore
     https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225
@@ -6,7 +6,7 @@ llvm-toolchain-snapshot (1:17~++20230517015648+0b6264738f3d-1~exp1) experimental
   * Yet a new element (omp) to disable in cmake detection. Upstream #62622
   * remove some mlir example (libMyExtensionCh*.a)
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 17 May 2023 13:20:42 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 30 May 2023 23:13:41 +0200
 
 llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium
 

From f8ae68d33d2ba88da2cef7cdbb6414d813be2244 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 31 May 2023 11:28:11 +0200
Subject: [PATCH 071/349] remove patch applied upstream

---
 .../patches/mbstate_workaround_issue_62523.diff | 17 -----------------
 debian/patches/series                           |  1 -
 2 files changed, 18 deletions(-)
 delete mode 100644 debian/patches/mbstate_workaround_issue_62523.diff

diff --git a/debian/patches/mbstate_workaround_issue_62523.diff b/debian/patches/mbstate_workaround_issue_62523.diff
deleted file mode 100644
index 32b52455..00000000
--- a/debian/patches/mbstate_workaround_issue_62523.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: llvm-toolchain-snapshot_17~++20230530094321+b187215a44f7/libcxx/include/__mbstate_t.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230530094321+b187215a44f7.orig/libcxx/include/__mbstate_t.h
-+++ llvm-toolchain-snapshot_17~++20230530094321+b187215a44f7/libcxx/include/__mbstate_t.h
-@@ -35,7 +35,11 @@
- #  define __CORRECT_ISO_CPP_WCHAR_H_PROTO
- #endif
- 
--#if __has_include(<bits/types/mbstate_t.h>)
-+
-+#if __has_include(<bits/alltypes.h>)  // Probe for musl
-+#define __NEED_mbstate_t  // Tell musl we need __mbstate_t (and nothing else)
-+#include <bits/alltypes.h>
-+#elif __has_include(<bits/types/mbstate_t.h>)
- #   include <bits/types/mbstate_t.h> // works on most Unixes
- #elif __has_include(<sys/_types/_mbstate_t.h>)
- #   include <sys/_types/_mbstate_t.h> // works on Darwin
diff --git a/debian/patches/series b/debian/patches/series
index 372ab88a..f2744617 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,3 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-mbstate_workaround_issue_62523.diff

From 0357e208ccdf98aa4960badbf990bcc075f7b6a3 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 1 Jun 2023 18:33:22 +0200
Subject: [PATCH 072/349] rebase of the patches

---
 debian/patches/bolt-disable-emit-relocs.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/bolt-disable-emit-relocs.patch b/debian/patches/bolt-disable-emit-relocs.patch
index fba8a7f1..ca0e61c3 100644
--- a/debian/patches/bolt-disable-emit-relocs.patch
+++ b/debian/patches/bolt-disable-emit-relocs.patch
@@ -1,9 +1,9 @@
-Index: llvm-toolchain-snapshot_16~++20230104114047+37228b1baa48/bolt/tools/merge-fdata/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230601055733+ee6ec2c5f1a5/bolt/tools/merge-fdata/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230104114047+37228b1baa48.orig/bolt/tools/merge-fdata/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20230104114047+37228b1baa48/bolt/tools/merge-fdata/CMakeLists.txt
-@@ -18,6 +18,6 @@ install(PROGRAMS
-   )
+--- llvm-toolchain-snapshot_17~++20230601055733+ee6ec2c5f1a5.orig/bolt/tools/merge-fdata/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230601055733+ee6ec2c5f1a5/bolt/tools/merge-fdata/CMakeLists.txt
+@@ -12,6 +12,6 @@ add_bolt_tool(merge-fdata
+ add_dependencies(bolt merge-fdata)
  
  # Emit relocations for BOLT meta test (bolt/test/runtime/meta-merge-fdata.test)
 -if (BOLT_INCLUDE_TESTS AND UNIX AND NOT APPLE)

From 6ee65199a91ef2c114beebc78d2fa29a59b45d5a Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 2 Jun 2023 07:54:11 +0200
Subject: [PATCH 073/349] llvm-bat-dump is no longer installed

https://github.com/llvm/llvm-project/commit/f3269a94e729b02e9d7c07257c45b098506cca22
---
 debian/bolt-X.Y.install.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/bolt-X.Y.install.in b/debian/bolt-X.Y.install.in
index 26610f3b..1119f0fc 100644
--- a/debian/bolt-X.Y.install.in
+++ b/debian/bolt-X.Y.install.in
@@ -3,10 +3,9 @@ usr/bin/llvm-bolt-heatmap-@LLVM_VERSION@
 usr/bin/llvm-boltdiff-@LLVM_VERSION@
 usr/bin/merge-fdata-@LLVM_VERSION@
 usr/bin/perf2bolt-@LLVM_VERSION@
-usr/bin/llvm-bat-dump-@LLVM_VERSION@
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bolt
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bolt-heatmap
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-boltdiff
 usr/lib/llvm-@LLVM_VERSION@/bin/merge-fdata
 usr/lib/llvm-@LLVM_VERSION@/bin/perf2bolt
-usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bat-dump
+

From 9010f36b6fa675d6bec3609819a3f55b5d7fbae1 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 3 Jun 2023 11:08:28 +0200
Subject: [PATCH 074/349] prepare upload

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77478a9d..4516a064 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-snapshot (1:17~++20230530111226+43bec3376c07-1~exp1) experimental; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230603110125+d072d110227d-1~exp1) experimental; urgency=medium
 
   * llvm-debuginfod not installed anymore
     https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225
@@ -6,7 +6,7 @@ llvm-toolchain-snapshot (1:17~++20230530111226+43bec3376c07-1~exp1) experimental
   * Yet a new element (omp) to disable in cmake detection. Upstream #62622
   * remove some mlir example (libMyExtensionCh*.a)
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 30 May 2023 23:13:41 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 03 Jun 2023 11:01:35 +0200
 
 llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium
 

From eebdfc57291bbd4c463ebfc259ed7fc1a830acf7 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 3 Jun 2023 11:55:50 +0200
Subject: [PATCH 075/349] also make sure that llvm-as is available

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 04ef6071..7b14fbba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -780,7 +780,7 @@ endif
 
 debian-libclc-build:
 # workaround missing files on i386
-	cd $(TARGET_BUILD_STAGE2) && ninja opt llvm-link
+	cd $(TARGET_BUILD_STAGE2) && ninja opt llvm-link llvm-as
 # Builds libclc
 	mkdir -p libclc/build
 	echo "Using cmake: $(CMAKE_BIN)"

From dc2fa7b52be28626768be59b7242a9ac3c50afc8 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 3 Jun 2023 14:45:10 +0200
Subject: [PATCH 076/349] rebase of the patch

---
 debian/patches/openmp-fix-runtimes-build.diff | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 36a9ccfc..5caf41c6 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/llvm/runtimes/CMakeLists.txt
 @@ -236,6 +236,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}
@@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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_17~++20230523093327+96a003b9bf79/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/CMakeLists.txt
-@@ -101,6 +101,28 @@ else()
+--- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/CMakeLists.txt
+@@ -94,6 +94,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
  
@@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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_17~++20230523093327+96a003b9bf79/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -55,6 +55,8 @@ endif()
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -82,10 +82,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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_17~++20230523093327+96a003b9bf79/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/src/CMakeLists.txt
 @@ -36,7 +36,9 @@ add_llvm_library(omptarget
    omp
  
@@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -112,11 +112,11 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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_17~++20230523093327+96a003b9bf79/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/src/CMakeLists.txt
-@@ -141,6 +141,7 @@ set_source_files_properties(${LIBOMP_GNU
+--- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/src/CMakeLists.txt
+@@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
    set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
@@ -124,7 +124,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/s
  else()
    set(LIBOMP_LINKER_LANGUAGE CXX)
  endif()
-@@ -202,6 +203,8 @@ else()
+@@ -200,6 +201,8 @@ else()
    )
  endif()
  
@@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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_17~++20230523093327+96a003b9bf79/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)

From 327d1eaa73387823d03bc25046049c2ecf4fde56 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 3 Jun 2023 14:53:53 +0200
Subject: [PATCH 077/349] rebase of the patch

---
 debian/patches/openmp-fix-runtimes-build.diff | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 5caf41c6..8fcbac71 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/llvm/runtimes/CMakeLists.txt
 @@ -236,6 +236,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}
@@ -23,12 +23,12 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/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_17~++20230603110125+d072d110227d/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/CMakeLists.txt
 @@ -94,6 +94,28 @@ else()
-   set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
+   get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
  endif()
  
 +option(OPENMP_USE_LLVM_UNWINDER "Build and use the LLVM unwinder" OFF)
@@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/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_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -55,6 +55,8 @@ endif()
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -82,10 +82,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/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_17~++20230603110125+d072d110227d/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/src/CMakeLists.txt
 @@ -36,7 +36,9 @@ add_llvm_library(omptarget
    omp
  
@@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -112,10 +112,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/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_17~++20230603110125+d072d110227d/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/src/CMakeLists.txt
 @@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/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_17~++20230603110125+d072d110227d/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)

From 3303ec2af462e2d06e10fda8e0a240ddddb96b52 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 9 Jun 2023 13:25:49 +0200
Subject: [PATCH 078/349] Try to pass MAKE_C_COMPILER_LAUNCHER and
 CMAKE_CXX_COMPILER_LAUNCHER in CLANG_BOOTSTRAP_PASSTHROUGH for sccache in
 stage2

---
 debian/changelog | 4 +++-
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4516a064..357e499e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ llvm-toolchain-snapshot (1:17~++20230603110125+d072d110227d-1~exp1) experimental
   * New snapshot release
   * Yet a new element (omp) to disable in cmake detection. Upstream #62622
   * remove some mlir example (libMyExtensionCh*.a)
+  * Try to pass MAKE_C_COMPILER_LAUNCHER and CMAKE_CXX_COMPILER_LAUNCHER
+    in CLANG_BOOTSTRAP_PASSTHROUGH for sccache in stage2
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 03 Jun 2023 11:01:35 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 09 Jun 2023 13:25:01 +0200
 
 llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 7b14fbba..ec2a39d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -705,7 +705,7 @@ endif
 	-DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
 	-DCLANG_ENABLE_BOOTSTRAP=ON \
 	-DCLANG_BOOTSTRAP_TARGETS="$(ENABLED_STAGE2_CMAKE_BUILD_TARGETS)" \
-	-DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION" \
+	-DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION;CMAKE_C_COMPILER_LAUNCHER;CMAKE_CXX_COMPILER_LAUNCHER" \
 	-DBOOTSTRAP_CMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DBOOTSTRAP_CMAKE_C_FLAGS_RELWITHDEBINFO="$(opt_flags)" \
 	-DBOOTSTRAP_CMAKE_CXX_FLAGS_RELWITHDEBINFO="$(opt_flags)" \

From b05dc230b016588a580eed5e1c870fea40848c5d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 10 Jun 2023 12:36:00 +0200
Subject: [PATCH 079/349] workaround issue 63225

---
 debian/patches/series                    |  1 +
 debian/patches/workaround-bug-63225.diff | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 debian/patches/workaround-bug-63225.diff

diff --git a/debian/patches/series b/debian/patches/series
index f2744617..9af82b42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,3 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
+workaround-bug-63225.diff
diff --git a/debian/patches/workaround-bug-63225.diff b/debian/patches/workaround-bug-63225.diff
new file mode 100644
index 00000000..94f41f5a
--- /dev/null
+++ b/debian/patches/workaround-bug-63225.diff
@@ -0,0 +1,13 @@
+Index: llvm-toolchain-snapshot_17~++20230610085902+8e44b849da1c/llvm/lib/CodeGen/MachineScheduler.cpp
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230610085902+8e44b849da1c.orig/llvm/lib/CodeGen/MachineScheduler.cpp
++++ llvm-toolchain-snapshot_17~++20230610085902+8e44b849da1c/llvm/lib/CodeGen/MachineScheduler.cpp
+@@ -2813,7 +2813,7 @@ LLVM_DUMP_METHOD void SchedBoundary::dum
+       dbgs() << ResName << "(" << UnitIdx << ") = ";
+       if (SchedModel && SchedModel->enableIntervals()) {
+         if (ReservedResourceSegments.count(StartIdx + UnitIdx))
+-          dbgs() << ReservedResourceSegments.at(StartIdx + UnitIdx);
++          dbgs() << "ReservedResourceSegments.at(StartIdx + UnitIdx)";
+         else
+           dbgs() << "{ }\n";
+       } else

From 5a8c190517157a74b787e317430faf94935f2403 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 12 Jun 2023 09:14:17 +0200
Subject: [PATCH 080/349] disable workaround to reproduce the issue

---
 debian/patches/series | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/series b/debian/patches/series
index 9af82b42..e453b03c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-workaround-bug-63225.diff
+#workaround-bug-63225.diff

From 86d67ea6c4e3aea40e03742f621ce37d2722c6c3 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 12 Jun 2023 16:36:03 +0200
Subject: [PATCH 081/349] Revert "disable workaround to reproduce the issue"

This reverts commit 5a8c190517157a74b787e317430faf94935f2403.
---
 debian/patches/series | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/series b/debian/patches/series
index e453b03c..9af82b42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-#workaround-bug-63225.diff
+workaround-bug-63225.diff

From ac90d1c78c2fae48e88f160d9471a6bea67e4e79 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 13 Jun 2023 16:39:15 +0200
Subject: [PATCH 082/349] try a new fix for it

---
 debian/patches/workaround-bug-63225.diff | 33 ++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/debian/patches/workaround-bug-63225.diff b/debian/patches/workaround-bug-63225.diff
index 94f41f5a..6f69b289 100644
--- a/debian/patches/workaround-bug-63225.diff
+++ b/debian/patches/workaround-bug-63225.diff
@@ -1,13 +1,20 @@
-Index: llvm-toolchain-snapshot_17~++20230610085902+8e44b849da1c/llvm/lib/CodeGen/MachineScheduler.cpp
-===================================================================
---- llvm-toolchain-snapshot_17~++20230610085902+8e44b849da1c.orig/llvm/lib/CodeGen/MachineScheduler.cpp
-+++ llvm-toolchain-snapshot_17~++20230610085902+8e44b849da1c/llvm/lib/CodeGen/MachineScheduler.cpp
-@@ -2813,7 +2813,7 @@ LLVM_DUMP_METHOD void SchedBoundary::dum
-       dbgs() << ResName << "(" << UnitIdx << ") = ";
-       if (SchedModel && SchedModel->enableIntervals()) {
-         if (ReservedResourceSegments.count(StartIdx + UnitIdx))
--          dbgs() << ReservedResourceSegments.at(StartIdx + UnitIdx);
-+          dbgs() << "ReservedResourceSegments.at(StartIdx + UnitIdx)";
-         else
-           dbgs() << "{ }\n";
-       } else
+diff --git a/llvm/include/llvm/CodeGen/MachineScheduler.h b/llvm/include/llvm/CodeGen/MachineScheduler.h
+--- a/llvm/include/llvm/CodeGen/MachineScheduler.h
++++ b/llvm/include/llvm/CodeGen/MachineScheduler.h
+@@ -815,7 +815,6 @@
+                          const ResourceSegments &c2) {
+     return c1._Intervals == c2._Intervals;
+   }
+-#ifndef NDEBUG
+   friend llvm::raw_ostream &operator<<(llvm::raw_ostream &os,
+                                        const ResourceSegments &Segments) {
+     os << "{ ";
+@@ -824,7 +823,6 @@
+     os << "}\n";
+     return os;
+   }
+-#endif
+ };
+ 
+ /// Each Scheduling boundary is associated with ready queues. It tracks the
+

From 286c703614c65469eabe79db2c764eda14978645 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 14 Jun 2023 17:48:07 +0200
Subject: [PATCH 083/349] remove patch applied upstream

---
 debian/patches/series                    |  1 -
 debian/patches/workaround-bug-63225.diff | 20 --------------------
 2 files changed, 21 deletions(-)
 delete mode 100644 debian/patches/workaround-bug-63225.diff

diff --git a/debian/patches/series b/debian/patches/series
index 9af82b42..f2744617 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,3 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-workaround-bug-63225.diff
diff --git a/debian/patches/workaround-bug-63225.diff b/debian/patches/workaround-bug-63225.diff
deleted file mode 100644
index 6f69b289..00000000
--- a/debian/patches/workaround-bug-63225.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/llvm/include/llvm/CodeGen/MachineScheduler.h b/llvm/include/llvm/CodeGen/MachineScheduler.h
---- a/llvm/include/llvm/CodeGen/MachineScheduler.h
-+++ b/llvm/include/llvm/CodeGen/MachineScheduler.h
-@@ -815,7 +815,6 @@
-                          const ResourceSegments &c2) {
-     return c1._Intervals == c2._Intervals;
-   }
--#ifndef NDEBUG
-   friend llvm::raw_ostream &operator<<(llvm::raw_ostream &os,
-                                        const ResourceSegments &Segments) {
-     os << "{ ";
-@@ -824,7 +823,6 @@
-     os << "}\n";
-     return os;
-   }
--#endif
- };
- 
- /// Each Scheduling boundary is associated with ready queues. It tracks the
-

From f7edc8a190f17d87505ad2e9ff0eb2c71c0326f3 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sat, 24 Jun 2023 22:19:04 +0200
Subject: [PATCH 084/349] Actually add patch

---
 debian/patches/ubuntu-releases.patch | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 debian/patches/ubuntu-releases.patch

diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch
new file mode 100644
index 00000000..8b2bec1c
--- /dev/null
+++ b/debian/patches/ubuntu-releases.patch
@@ -0,0 +1,38 @@
+Description: Update the list of Ubuntu release names
+Forwarded: no
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2023-04-29
+
+Index: llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h
+===================================================================
+--- llvm-toolchain-16-16.0.5.orig/clang/include/clang/Driver/Distro.h
++++ llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h
+@@ -77,6 +77,7 @@
+     UbuntuJammy,
+     UbuntuKinetic,
+     UbuntuLunar,
++    UbuntuMantic,
+     UnknownDistro
+   };
+ 
+@@ -128,7 +129,7 @@
+   }
+ 
+   bool IsUbuntu() const {
+-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuLunar;
++    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
+   }
+ 
+   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
+Index: llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp
+===================================================================
+--- llvm-toolchain-16-16.0.5.orig/clang/lib/Driver/Distro.cpp
++++ llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp
+@@ -93,6 +93,7 @@
+                     .Case("jammy", Distro::UbuntuJammy)
+                     .Case("kinetic", Distro::UbuntuKinetic)
+                     .Case("lunar", Distro::UbuntuLunar)
++                    .Case("mantic", Distro::UbuntuMantic)
+                     .Default(Distro::UnknownDistro);
+   return Version;
+ }

From bd7dc4157609fffd1742664df8f2bfb612142d6e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 24 Jun 2023 22:44:01 +0200
Subject: [PATCH 085/349] remove patch already upstream

---
 debian/patches/series                |  1 -
 debian/patches/ubuntu-releases.patch | 38 ----------------------------
 2 files changed, 39 deletions(-)
 delete mode 100644 debian/patches/ubuntu-releases.patch

diff --git a/debian/patches/series b/debian/patches/series
index d98b3607..9656f50c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -149,6 +149,5 @@ force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
 
-ubuntu-releases.patch
 new-cmake-build-fix.patch
 HIP-search-path-fix.patch
diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch
deleted file mode 100644
index 8b2bec1c..00000000
--- a/debian/patches/ubuntu-releases.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Update the list of Ubuntu release names
-Forwarded: no
-Author: Graham Inggs <ginggs@debian.org>
-Last-Update: 2023-04-29
-
-Index: llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h
-===================================================================
---- llvm-toolchain-16-16.0.5.orig/clang/include/clang/Driver/Distro.h
-+++ llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h
-@@ -77,6 +77,7 @@
-     UbuntuJammy,
-     UbuntuKinetic,
-     UbuntuLunar,
-+    UbuntuMantic,
-     UnknownDistro
-   };
- 
-@@ -128,7 +129,7 @@
-   }
- 
-   bool IsUbuntu() const {
--    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuLunar;
-+    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
-   }
- 
-   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
-Index: llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp
-===================================================================
---- llvm-toolchain-16-16.0.5.orig/clang/lib/Driver/Distro.cpp
-+++ llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp
-@@ -93,6 +93,7 @@
-                     .Case("jammy", Distro::UbuntuJammy)
-                     .Case("kinetic", Distro::UbuntuKinetic)
-                     .Case("lunar", Distro::UbuntuLunar)
-+                    .Case("mantic", Distro::UbuntuMantic)
-                     .Default(Distro::UnknownDistro);
-   return Version;
- }

From 73e67f85286fc633af0b140b571198faaed35418 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 24 Jun 2023 23:49:45 +0200
Subject: [PATCH 086/349] remove patches applied upsteram

---
 debian/patches/HIP-search-path-fix.patch |  45 -------
 debian/patches/new-cmake-build-fix.patch | 146 -----------------------
 debian/patches/series                    |   2 -
 3 files changed, 193 deletions(-)
 delete mode 100644 debian/patches/HIP-search-path-fix.patch
 delete mode 100644 debian/patches/new-cmake-build-fix.patch

diff --git a/debian/patches/HIP-search-path-fix.patch b/debian/patches/HIP-search-path-fix.patch
deleted file mode 100644
index 79e82bed..00000000
--- a/debian/patches/HIP-search-path-fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f8598357662dc8dd0f4400bcaeb48e8befe43ecc Mon Sep 17 00:00:00 2001
-From: Cordell Bloor <Cordell.Bloor@amd.com>
-Date: Tue, 9 May 2023 09:46:48 -0400
-Subject: [PATCH] [HIP] Detect HIP for Ubuntu, Mint, Gentoo, etc.
-
-HIP may be installed into /usr or /usr/local on a variety of Linux
-operating systems. It may become unwieldy to list them all.
-
-Reviewed by: Siu Chi Chan, Yaxun Liu
-
-Differential Revision: https://reviews.llvm.org/D149110
----
- clang/lib/Driver/ToolChains/AMDGPU.cpp | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp
-index acedcfabefe1c..1eb22ed8704c9 100644
---- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
-+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -11,7 +11,6 @@
- #include "clang/Basic/TargetID.h"
- #include "clang/Config/config.h"
- #include "clang/Driver/Compilation.h"
--#include "clang/Driver/Distro.h"
- #include "clang/Driver/DriverDiagnostic.h"
- #include "clang/Driver/InputInfo.h"
- #include "clang/Driver/Options.h"
-@@ -309,13 +308,10 @@ RocmInstallationDetector::getInstallationPathCandidates() {
-     ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm,
-                                 /*StrictChecking=*/true);
- 
--  Distro Dist(D.getVFS(), llvm::Triple(llvm::sys::getProcessTriple()));
--  if (Dist.IsDebian() || Dist.IsRedhat()) {
--    ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local",
--                                /*StrictChecking=*/true);
--    ROCmSearchDirs.emplace_back(D.SysRoot + "/usr",
--                                /*StrictChecking=*/true);
--  }
-+  ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local",
-+                              /*StrictChecking=*/true);
-+  ROCmSearchDirs.emplace_back(D.SysRoot + "/usr",
-+                              /*StrictChecking=*/true);
- 
-   DoPrintROCmSearchDirs();
-   return ROCmSearchDirs;
diff --git a/debian/patches/new-cmake-build-fix.patch b/debian/patches/new-cmake-build-fix.patch
deleted file mode 100644
index 85e3c40f..00000000
--- a/debian/patches/new-cmake-build-fix.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 61967bbc7d4e9f72fb1fa082fa2235b99e36b698 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <npopov@redhat.com>
-Date: Thu, 20 Apr 2023 14:59:27 +0200
-Subject: [PATCH] [OpenMP] Replace libomp_check_linker_flag with
- llvm_check_compiler_linker_flag
-
-Replace the custom libomp_check_linker_flag() implementation with
-llvm_check_compiler_linker_flag() from the common cmake utils. Due
-to the way the custom implementation is implemented (capturing
-output from an entire nested cmake invocation) it can easily end
-up incorrectly detecting flags as unavailable, e.g. because "error",
-"unknown" or similar occurs inside compiler flags, the directory
-name, etc.
-
-Fixes https://github.com/llvm/llvm-project/issues/62240.
-
-Differential Revision: https://reviews.llvm.org/D148798
----
- .../runtime/cmake/LibompCheckLinkerFlag.cmake | 72 -------------------
- openmp/runtime/cmake/config-ix.cmake          | 18 ++---
- 2 files changed, 9 insertions(+), 81 deletions(-)
- delete mode 100644 openmp/runtime/cmake/LibompCheckLinkerFlag.cmake
-
-diff --git a/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake b/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake
-deleted file mode 100644
-index bcc0ca80c866e..0000000000000
---- a/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#
--#//===----------------------------------------------------------------------===//
--#//
--#// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
--#// See https://llvm.org/LICENSE.txt for license information.
--#// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
--#//
--#//===----------------------------------------------------------------------===//
--#
--
--include(GNUInstallDirs)
--
--# Checking a linker flag to build a shared library
--# There is no real trivial way to do this in CMake, so we implement it here
--# this will have ${boolean} = TRUE if the flag succeeds, otherwise FALSE.
--function(libomp_check_linker_flag flag boolean)
--  if(NOT DEFINED "${boolean}")
--  set(retval TRUE)
--  set(library_source
--    "int foo(int a) { return a*a; }")
--  set(cmake_source
--    "cmake_minimum_required(VERSION 3.13.4)
--     project(foo C)
--     set(CMAKE_SHARED_LINKER_FLAGS \"${flag}\")
--     add_library(foo SHARED src_to_link.c)")
--  # Compiling as a part of runtimes introduces ARCH-unknown-linux-gnu as a part
--  # of a working directory.  So adding a guard for unknown.
--  set(failed_regexes "[Ee]rror;[Uu]nknown[^-];[Ss]kipping;LINK : warning;Unsupported command line")
--  set(base_dir ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/link_flag_check_${boolean})
--  file(MAKE_DIRECTORY ${base_dir})
--  file(MAKE_DIRECTORY ${base_dir}/build)
--  file(WRITE ${base_dir}/src_to_link.c "${library_source}")
--  file(WRITE ${base_dir}/CMakeLists.txt "${cmake_source}")
--
--  message(STATUS "Performing Test ${boolean}")
--  try_compile(
--    try_compile_result
--    ${base_dir}/build
--    ${base_dir}
--    foo
--    OUTPUT_VARIABLE OUTPUT)
--
--  if(try_compile_result)
--    foreach(regex IN LISTS failed_regexes)
--      # Ignore the warning about the newer or unknown CUDA version.
--      if(("${OUTPUT}" MATCHES ${regex}) AND NOT ("${OUTPUT}" MATCHES "Unknown CUDA version"))
--        set(retval FALSE)
--      endif()
--    endforeach()
--  else()
--    set(retval FALSE)
--  endif()
--
--  if(${retval})
--    set(${boolean} 1 CACHE INTERNAL "Test ${boolean}")
--    message(STATUS "Performing Test ${boolean} - Success")
--    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
--      "Performing C Linker Flag test ${boolean} succeeded with the following output:\n"
--      "${OUTPUT}\n"
--      "Source file was:\n${library_source}\n")
--  else()
--    set(${boolean} "" CACHE INTERNAL "Test ${boolean}")
--    message(STATUS "Performing Test ${boolean} - Failed")
--    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
--      "Performing C Linker Flag test ${boolean} failed with the following output:\n"
--      "${OUTPUT}\n"
--      "Source file was:\n${library_source}\n")
--  endif()
--
--  set(${boolean} ${retval} PARENT_SCOPE)
--  endif()
--endfunction()
-diff --git a/openmp/runtime/cmake/config-ix.cmake b/openmp/runtime/cmake/config-ix.cmake
-index d0eda6d8ca39a..ca3cb43c285db 100644
---- a/openmp/runtime/cmake/config-ix.cmake
-+++ b/openmp/runtime/cmake/config-ix.cmake
-@@ -16,8 +16,8 @@ include(CheckIncludeFile)
- include(CheckLibraryExists)
- include(CheckIncludeFiles)
- include(CheckSymbolExists)
--include(LibompCheckLinkerFlag)
- include(LibompCheckFortranFlag)
-+include(LLVMCheckCompilerLinkerFlag)
- 
- # Check for versioned symbols
- function(libomp_check_version_symbols retval)
-@@ -133,13 +133,13 @@ check_symbol_exists(_aligned_malloc "malloc.h" LIBOMP_HAVE__ALIGNED_MALLOC)
- 
- # Check linker flags
- if(WIN32)
--  libomp_check_linker_flag(/SAFESEH LIBOMP_HAVE_SAFESEH_FLAG)
-+  llvm_check_compiler_linker_flag(C /SAFESEH LIBOMP_HAVE_SAFESEH_FLAG)
- elseif(NOT APPLE)
--  libomp_check_linker_flag(-Wl,-x LIBOMP_HAVE_X_FLAG)
--  libomp_check_linker_flag(-Wl,--as-needed LIBOMP_HAVE_AS_NEEDED_FLAG)
--  libomp_check_linker_flag("-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_test_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
--  libomp_check_linker_flag(-static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG)
--  libomp_check_linker_flag(-Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG)
-+  llvm_check_compiler_linker_flag(C -Wl,-x LIBOMP_HAVE_X_FLAG)
-+  llvm_check_compiler_linker_flag(C -Wl,--as-needed LIBOMP_HAVE_AS_NEEDED_FLAG)
-+  llvm_check_compiler_linker_flag(C "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_test_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-+  llvm_check_compiler_linker_flag(C -static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG)
-+  llvm_check_compiler_linker_flag(C -Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG)
- endif()
- 
- # Check Intel(R) C Compiler specific flags
-@@ -150,8 +150,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Intel" OR CMAKE_C_COMPILER_ID STREQUAL "IntelLL
-   check_cxx_compiler_flag(-Qoption,cpp,--extended_float_types LIBOMP_HAVE_EXTENDED_FLOAT_TYPES_FLAG)
-   check_cxx_compiler_flag(-falign-stack=maintain-16-byte LIBOMP_HAVE_FALIGN_STACK_FLAG)
-   check_cxx_compiler_flag("-opt-streaming-stores never" LIBOMP_HAVE_OPT_STREAMING_STORES_FLAG)
--  libomp_check_linker_flag(-static-intel LIBOMP_HAVE_STATIC_INTEL_FLAG)
--  libomp_check_linker_flag(-no-intel-extensions LIBOMP_HAVE_NO_INTEL_EXTENSIONS_FLAG)
-+  llvm_check_compiler_linker_flag(C -static-intel LIBOMP_HAVE_STATIC_INTEL_FLAG)
-+  llvm_check_compiler_linker_flag(C -no-intel-extensions LIBOMP_HAVE_NO_INTEL_EXTENSIONS_FLAG)
-   check_library_exists(irc_pic _intel_fast_memcpy "" LIBOMP_HAVE_IRC_PIC_LIBRARY)
- endif()
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9656f50c..bb9861a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -149,5 +149,3 @@ force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
 
-new-cmake-build-fix.patch
-HIP-search-path-fix.patch

From ef8fd0c0fb77cc4821f3bc356d1a3cb7033e88d5 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 27 Jun 2023 08:55:19 +0200
Subject: [PATCH 087/349] Revert "Adjust LIBCXXABI_ARM_EHABI =>
 _LIBCXXABI_ARM_EHABI Issue:
 https://github.com/llvm/llvm-project/issues/59240"

This reverts commit 20ff92c9829b28c34e434da22738a8420164c132.
---
 debian/changelog                                    |  4 +---
 debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch | 10 +++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 54817f05..fe75408d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -282,10 +282,8 @@ llvm-toolchain-15 (1:15.0.7-5~exp1) experimental; urgency=medium
   * Remove old code to manage Debian stretch
   * Force the replacement of new Ubuntu packages introduced in
     https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755
-  * Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI
-    Issue: https://github.com/llvm/llvm-project/issues/59240
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 04 Jun 2023 11:35:54 +0200
+ --
 
 llvm-toolchain-15 (1:15.0.7-4) unstable; urgency=medium
 
diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch
index 23351802..fa5d859c 100644
--- a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch
+++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch
@@ -16,7 +16,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx
  #ifdef __USING_SJLJ_EXCEPTIONS__
      _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
 -#else
-+#elif !_LIBCXXABI_ARM_EHABI
++#elif !LIBCXXABI_ARM_EHABI
      _Unwind_RaiseException(&exception_header->unwindHeader);
 +#else
 +    _Unwind_RaiseException(exception_header->unwindHeader);
@@ -34,7 +34,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx
              //    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 (...)!
-+#if !_LIBCXXABI_ARM_EHABI
++#if !LIBCXXABI_ARM_EHABI
              _Unwind_DeleteException(&globals->caughtExceptions->unwindHeader);
 +#else
 +            _Unwind_DeleteException(globals->caughtExceptions->unwindHeader);
@@ -47,7 +47,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx
  #ifdef __USING_SJLJ_EXCEPTIONS__
      _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
 -#else
-+#elif !_LIBCXXABI_ARM_EHABI
++#elif !LIBCXXABI_ARM_EHABI
      _Unwind_RaiseException(&exception_header->unwindHeader);
 +#else
 +    _Unwind_RaiseException(exception_header->unwindHeader);
@@ -58,7 +58,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx
          dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup;
  #ifdef __USING_SJLJ_EXCEPTIONS__
          _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader);
-+#elif !_LIBCXXABI_ARM_EHABI
++#elif !LIBCXXABI_ARM_EHABI
 +	_Unwind_RaiseException(&dep_exception_header->unwindHeader);
  #else
 -        _Unwind_RaiseException(&dep_exception_header->unwindHeader);
@@ -74,7 +74,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx
  _LIBCXXABI_HIDDEN void     __setExceptionClass  (      _Unwind_Exception*, uint64_t);
  _LIBCXXABI_HIDDEN bool     __isOurExceptionClass(const _Unwind_Exception*);
  
-+#if _LIBCXXABI_ARM_EHABI
++#if LIBCXXABI_ARM_EHABI
 +// GCC has _Unwind_Control_Block in unwind.h (unwind_arm_common.h)
 +#if defined(__clang__)
 +struct _Unwind_Control_Block

From db5c4c98b454ffd831e28fdf27271f9cde996313 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 27 Jun 2023 10:19:25 +0200
Subject: [PATCH 088/349] Revert   * Adjust LIBCXXABI_ARM_EHABI =>
 _LIBCXXABI_ARM_EHABI     Issue:
 https://github.com/llvm/llvm-project/issues/59240

---
 debian/changelog | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe75408d..8a485805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -248,10 +248,15 @@ llvm-toolchain-snapshot (1:16~++20220731055325+02b3a358926e-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 27 Jul 2022 21:36:27 +0200
 
-llvm-toolchain-15 (1:15.0.7-6) UNRELEASED; urgency=medium
+llvm-toolchain-15 (1:15.0.7-6) unstable; urgency=medium
 
+  [ Sylvestre Ledru ]
   * Only pass -Bno-symbolic if it exists
 
+  [ Gianfranco Costamagna ]
+  * Revert LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI change,
+    FTBFS on arm*.
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 26 Jun 2023 10:13:40 +0200
 
 llvm-toolchain-15 (1:15.0.7-5) unstable; urgency=medium
@@ -282,8 +287,10 @@ llvm-toolchain-15 (1:15.0.7-5~exp1) experimental; urgency=medium
   * Remove old code to manage Debian stretch
   * Force the replacement of new Ubuntu packages introduced in
     https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755
+  * Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI
+    Issue: https://github.com/llvm/llvm-project/issues/59240
 
- --
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 04 Jun 2023 11:35:54 +0200
 
 llvm-toolchain-15 (1:15.0.7-4) unstable; urgency=medium
 

From 3fa385b3b66c5b51fa545bca6ccae60b97dfdfbd Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 27 Jun 2023 10:19:59 +0200
Subject: [PATCH 089/349] Update changelog

---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8a485805..bf4425a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,17 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 28 Jan 2023 18:07:40 +0100
 
+llvm-toolchain-16 (1:16.0.6-3) unstable; urgency=medium
+
+  [ Sylvestre Ledru ]
+  * Only pass -Bno-symbolic if it exists
+
+  [ Gianfranco Costamagna ]
+  * Revert LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI change,
+    FTBFS on arm*.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 27 Jun 2023 08:58:16 +0200
+
 llvm-toolchain-16 (1:16.0.6-2) unstable; urgency=medium
 
   * Remove debian/NEWS to fix debian-news-entry-has-unknown-version

From e8709bc51825a6e5897d46df4afb026550887315 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 30 Jun 2023 09:17:11 +0200
Subject: [PATCH 090/349] Disable python3-lldb-17 for buster (it has been this
 way for a while)

---
 debian/changelog | 1 +
 debian/rules     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bf4425a6..8dd395c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ llvm-toolchain-snapshot (1:17~++20230603110125+d072d110227d-1~exp1) experimental
   * remove some mlir example (libMyExtensionCh*.a)
   * Try to pass MAKE_C_COMPILER_LAUNCHER and CMAKE_CXX_COMPILER_LAUNCHER
     in CLANG_BOOTSTRAP_PASSTHROUGH for sccache in stage2
+  * Disable python3-lldb-17 for buster (it has been this way for a while)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 09 Jun 2023 13:25:01 +0200
 
diff --git a/debian/rules b/debian/rules
index 6250cd14..623eadc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1213,6 +1213,7 @@ endif
 	if test "$(DISTRO)" = "buster"; then \
 		mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \
 		touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
+		echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \
 	fi
 
 # Remove some mlir example

From 9189f11aef441367a84b124e58e580148bab584c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 30 Jun 2023 14:17:10 +0200
Subject: [PATCH 091/349] Try to workaround issue 63613

---
 debian/changelog                    |  1 +
 debian/patches/fix-issue-63613.diff | 12 ++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 14 insertions(+)
 create mode 100644 debian/patches/fix-issue-63613.diff

diff --git a/debian/changelog b/debian/changelog
index 8dd395c6..e13f908e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ llvm-toolchain-snapshot (1:17~++20230603110125+d072d110227d-1~exp1) experimental
   * Try to pass MAKE_C_COMPILER_LAUNCHER and CMAKE_CXX_COMPILER_LAUNCHER
     in CLANG_BOOTSTRAP_PASSTHROUGH for sccache in stage2
   * Disable python3-lldb-17 for buster (it has been this way for a while)
+  * Try to workaround issue 63613
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 09 Jun 2023 13:25:01 +0200
 
diff --git a/debian/patches/fix-issue-63613.diff b/debian/patches/fix-issue-63613.diff
new file mode 100644
index 00000000..a1305b44
--- /dev/null
+++ b/debian/patches/fix-issue-63613.diff
@@ -0,0 +1,12 @@
+Index: llvm-toolchain-snapshot_17~++20230630093049+0446bfcc5ca2/libcxx/src/filesystem/posix_compat.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230630093049+0446bfcc5ca2.orig/libcxx/src/filesystem/posix_compat.h
++++ llvm-toolchain-snapshot_17~++20230630093049+0446bfcc5ca2/libcxx/src/filesystem/posix_compat.h
+@@ -39,6 +39,7 @@
+ # include <fcntl.h>
+ # include <unistd.h>
+ # include <sys/stat.h>
++# include <sys/cdefs.h>
+ # include <sys/statvfs.h>
+ # include <sys/time.h>
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index bb9861a8..080a2b99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -149,3 +149,4 @@ force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
 
+fix-issue-63613.diff

From 85ddd94335bf78a2acdc23da75b304d3875e3b09 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 30 Jun 2023 17:22:19 +0200
Subject: [PATCH 092/349] try to add a second include

---
 debian/patches/fix-issue-63613.diff | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/patches/fix-issue-63613.diff b/debian/patches/fix-issue-63613.diff
index a1305b44..2bb83cb7 100644
--- a/debian/patches/fix-issue-63613.diff
+++ b/debian/patches/fix-issue-63613.diff
@@ -1,11 +1,12 @@
-Index: llvm-toolchain-snapshot_17~++20230630093049+0446bfcc5ca2/libcxx/src/filesystem/posix_compat.h
+Index: llvm-toolchain-snapshot_17~++20230630021901+d32fb5e5f51d/libcxx/src/filesystem/posix_compat.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230630093049+0446bfcc5ca2.orig/libcxx/src/filesystem/posix_compat.h
-+++ llvm-toolchain-snapshot_17~++20230630093049+0446bfcc5ca2/libcxx/src/filesystem/posix_compat.h
-@@ -39,6 +39,7 @@
+--- llvm-toolchain-snapshot_17~++20230630021901+d32fb5e5f51d.orig/libcxx/src/filesystem/posix_compat.h
++++ llvm-toolchain-snapshot_17~++20230630021901+d32fb5e5f51d/libcxx/src/filesystem/posix_compat.h
+@@ -39,6 +39,8 @@
  # include <fcntl.h>
  # include <unistd.h>
  # include <sys/stat.h>
++# include <features.h>
 +# include <sys/cdefs.h>
  # include <sys/statvfs.h>
  # include <sys/time.h>

From d2b398cee66a709377c10268426d446dae0014cc Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 4 Jul 2023 13:15:37 +0200
Subject: [PATCH 093/349] fix issue 63613

---
 debian/patches/fix-issue-63613.diff | 251 ++++++++++++++++++++++++++--
 1 file changed, 240 insertions(+), 11 deletions(-)

diff --git a/debian/patches/fix-issue-63613.diff b/debian/patches/fix-issue-63613.diff
index 2bb83cb7..75896021 100644
--- a/debian/patches/fix-issue-63613.diff
+++ b/debian/patches/fix-issue-63613.diff
@@ -1,13 +1,242 @@
-Index: llvm-toolchain-snapshot_17~++20230630021901+d32fb5e5f51d/libcxx/src/filesystem/posix_compat.h
+Index: llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/file_descriptor.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230630021901+d32fb5e5f51d.orig/libcxx/src/filesystem/posix_compat.h
-+++ llvm-toolchain-snapshot_17~++20230630021901+d32fb5e5f51d/libcxx/src/filesystem/posix_compat.h
-@@ -39,6 +39,8 @@
- # include <fcntl.h>
- # include <unistd.h>
- # include <sys/stat.h>
-+# include <features.h>
-+# include <sys/cdefs.h>
- # include <sys/statvfs.h>
- # include <sys/time.h>
+--- llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35.orig/libcxx/src/filesystem/file_descriptor.h
++++ llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/file_descriptor.h
+@@ -18,6 +18,7 @@
+ 
+ #include "error.h"
+ #include "posix_compat.h"
++#include "time_utils.h"
+ 
+ #if defined(_LIBCPP_WIN32API)
+ # define WIN32_LEAN_AND_MEAN
+Index: llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/filesystem_clock.cpp
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35.orig/libcxx/src/filesystem/filesystem_clock.cpp
++++ llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/filesystem_clock.cpp
+@@ -11,7 +11,7 @@
+ #include <filesystem>
+ #include <time.h>
+ 
+-#include "posix_compat.h" // TimeSpec
++#include "time_utils.h"
+ 
+ #if defined(_LIBCPP_WIN32API)
+ # define WIN32_LEAN_AND_MEAN
+Index: llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/posix_compat.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35.orig/libcxx/src/filesystem/posix_compat.h
++++ llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/posix_compat.h
+@@ -81,41 +81,6 @@ _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
+ namespace detail {
+ 
+ #if defined(_LIBCPP_WIN32API)
+-// Various C runtime versions (UCRT, or the legacy msvcrt.dll used by
+-// some mingw toolchains) provide different stat function implementations,
+-// with a number of limitations with respect to what we want from the
+-// stat function. Instead provide our own which does exactly what we want,
+-// along with our own stat structure and flag macros.
+-
+-struct TimeSpec {
+-  int64_t tv_sec;
+-  int64_t tv_nsec;
+-};
+-struct StatT {
+-  unsigned st_mode;
+-  TimeSpec st_atim;
+-  TimeSpec st_mtim;
+-  uint64_t st_dev; // FILE_ID_INFO::VolumeSerialNumber
+-  struct FileIdStruct {
+-    unsigned char id[16]; // FILE_ID_INFO::FileId
+-    bool operator==(const FileIdStruct &other) const {
+-      for (int i = 0; i < 16; i++)
+-        if (id[i] != other.id[i])
+-          return false;
+-      return true;
+-    }
+-  } st_ino;
+-  uint32_t st_nlink;
+-  uintmax_t st_size;
+-};
+-
+-#else
+-using TimeSpec = struct timespec;
+-using TimeVal = struct timeval;
+-using StatT = struct stat;
+-#endif
+-
+-#if defined(_LIBCPP_WIN32API)
+ 
+ // Various C runtime header sets provide more or less of these. As we
+ // provide our own implementation, undef all potential defines from the
+@@ -157,35 +122,6 @@ using StatT = struct stat;
+ 
+ #define O_NONBLOCK 0
+ 
+-
+-// There were 369 years and 89 leap days from the Windows epoch
+-// (1601) to the Unix epoch (1970).
+-#define FILE_TIME_OFFSET_SECS (uint64_t(369 * 365 + 89) * (24 * 60 * 60))
+-
+-inline TimeSpec filetime_to_timespec(LARGE_INTEGER li) {
+-  TimeSpec ret;
+-  ret.tv_sec = li.QuadPart / 10000000 - FILE_TIME_OFFSET_SECS;
+-  ret.tv_nsec = (li.QuadPart % 10000000) * 100;
+-  return ret;
+-}
+-
+-inline TimeSpec filetime_to_timespec(FILETIME ft) {
+-  LARGE_INTEGER li;
+-  li.LowPart = ft.dwLowDateTime;
+-  li.HighPart = ft.dwHighDateTime;
+-  return filetime_to_timespec(li);
+-}
+-
+-inline FILETIME timespec_to_filetime(TimeSpec ts) {
+-  LARGE_INTEGER li;
+-  li.QuadPart =
+-      ts.tv_nsec / 100 + (ts.tv_sec + FILE_TIME_OFFSET_SECS) * 10000000;
+-  FILETIME ft;
+-  ft.dwLowDateTime = li.LowPart;
+-  ft.dwHighDateTime = li.HighPart;
+-  return ft;
+-}
+-
+ inline int set_errno(int e = GetLastError()) {
+   errno = static_cast<int>(__win_err_to_errc(e));
+   return -1;
+Index: llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/time_utils.h
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35.orig/libcxx/src/filesystem/time_utils.h
++++ llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/time_utils.h
+@@ -21,13 +21,14 @@
+ 
+ #include "error.h"
+ #include "format_string.h"
+-#include "posix_compat.h"
+ 
+ #if defined(_LIBCPP_WIN32API)
+ # define WIN32_LEAN_AND_MEAN
+ # define NOMINMAX
+ # include <windows.h>
+ #else
++# include <fcntl.h>
++# include <sys/stat.h>
+ # include <sys/time.h> // for ::utimes as used in __last_write_time
  #endif
+ 
+@@ -40,6 +41,82 @@ _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
+ 
+ namespace detail {
+ 
++#if defined(_LIBCPP_WIN32API)
++// Various C runtime versions (UCRT, or the legacy msvcrt.dll used by
++// some mingw toolchains) provide different stat function implementations,
++// with a number of limitations with respect to what we want from the
++// stat function. Instead provide our own which does exactly what we want,
++// along with our own stat structure and flag macros.
++
++struct TimeSpec {
++  int64_t tv_sec;
++  int64_t tv_nsec;
++};
++struct StatT {
++  unsigned st_mode;
++  TimeSpec st_atim;
++  TimeSpec st_mtim;
++  uint64_t st_dev; // FILE_ID_INFO::VolumeSerialNumber
++  struct FileIdStruct {
++    unsigned char id[16]; // FILE_ID_INFO::FileId
++    bool operator==(const FileIdStruct &other) const {
++      for (int i = 0; i < 16; i++)
++        if (id[i] != other.id[i])
++          return false;
++      return true;
++    }
++  } st_ino;
++  uint32_t st_nlink;
++  uintmax_t st_size;
++};
++
++// There were 369 years and 89 leap days from the Windows epoch
++// (1601) to the Unix epoch (1970).
++#define FILE_TIME_OFFSET_SECS (uint64_t(369 * 365 + 89) * (24 * 60 * 60))
++
++inline TimeSpec filetime_to_timespec(LARGE_INTEGER li) {
++  TimeSpec ret;
++  ret.tv_sec = li.QuadPart / 10000000 - FILE_TIME_OFFSET_SECS;
++  ret.tv_nsec = (li.QuadPart % 10000000) * 100;
++  return ret;
++}
++
++inline TimeSpec filetime_to_timespec(FILETIME ft) {
++  LARGE_INTEGER li;
++  li.LowPart = ft.dwLowDateTime;
++  li.HighPart = ft.dwHighDateTime;
++  return filetime_to_timespec(li);
++}
++
++inline FILETIME timespec_to_filetime(TimeSpec ts) {
++  LARGE_INTEGER li;
++  li.QuadPart =
++      ts.tv_nsec / 100 + (ts.tv_sec + FILE_TIME_OFFSET_SECS) * 10000000;
++  FILETIME ft;
++  ft.dwLowDateTime = li.LowPart;
++  ft.dwHighDateTime = li.HighPart;
++  return ft;
++}
++
++#else
++using TimeSpec = struct timespec;
++using TimeVal = struct timeval;
++using StatT = struct stat;
++
++inline TimeVal make_timeval(TimeSpec const& ts) {
++  using namespace chrono;
++  auto Convert = [](long nsec) {
++    using int_type = decltype(std::declval<TimeVal>().tv_usec);
++    auto dur = duration_cast<microseconds>(nanoseconds(nsec)).count();
++    return static_cast<int_type>(dur);
++  };
++  TimeVal TV = {};
++  TV.tv_sec = ts.tv_sec;
++  TV.tv_usec = Convert(ts.tv_nsec);
++  return TV;
++}
++#endif
++
+ using chrono::duration;
+ using chrono::duration_cast;
+ 
+@@ -252,20 +329,9 @@ inline TimeSpec extract_mtime(StatT cons
+ inline TimeSpec extract_atime(StatT const& st) { return st.st_atim; }
+ #endif
+ 
+-#if !defined(_LIBCPP_WIN32API)
+-inline TimeVal make_timeval(TimeSpec const& ts) {
+-  using namespace chrono;
+-  auto Convert = [](long nsec) {
+-    using int_type = decltype(std::declval<TimeVal>().tv_usec);
+-    auto dur = duration_cast<microseconds>(nanoseconds(nsec)).count();
+-    return static_cast<int_type>(dur);
+-  };
+-  TimeVal TV = {};
+-  TV.tv_sec = ts.tv_sec;
+-  TV.tv_usec = Convert(ts.tv_nsec);
+-  return TV;
+-}
++#ifndef _LIBCPP_HAS_NO_FILESYSTEM
+ 
++#if !defined(_LIBCPP_WIN32API)
+ inline bool posix_utimes(const path& p, std::array<TimeSpec, 2> const& TS,
+                   error_code& ec) {
+   TimeVal ConvertedTS[2] = {make_timeval(TS[0]), make_timeval(TS[1])};
+@@ -310,6 +376,8 @@ inline file_time_type __extract_last_wri
+   return fs_time::convert_from_timespec(ts);
+ }
+ 
++#endif // !_LIBCPP_HAS_NO_FILESYSTEM
++
+ } // end namespace detail
+ 
+ _LIBCPP_END_NAMESPACE_FILESYSTEM

From 9866671841ffd4a168f3f620d63b9ee78d5005a6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 5 Jul 2023 21:27:50 +0200
Subject: [PATCH 094/349] rebase of the patches

---
 debian/patches/disable-sse2-old-x86.diff |  24 +--
 debian/patches/fix-issue-63613.diff      | 242 -----------------------
 debian/patches/series                    |   2 -
 3 files changed, 12 insertions(+), 256 deletions(-)
 delete mode 100644 debian/patches/fix-issue-63613.diff

diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff
index f70ac2b1..4f5d242a 100644
--- a/debian/patches/disable-sse2-old-x86.diff
+++ b/debian/patches/disable-sse2-old-x86.diff
@@ -1,13 +1,13 @@
-Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/include/llvm/TargetParser/X86TargetParser.def
+Index: llvm-toolchain-snapshot_17~++20230705085103+4ef04876ef17/llvm/lib/TargetParser/X86TargetParser.cpp
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/include/llvm/TargetParser/X86TargetParser.def
-+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/include/llvm/TargetParser/X86TargetParser.def
-@@ -251,7 +251,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")
--CPU_SPECIFIC("pentium_4", "pentium4", 'J', "+cmov,+mmx,+sse,+sse2")
-+CPU_SPECIFIC("pentium_4", "pentium4", 'J', "+cmov,+mmx,+sse")
- CPU_SPECIFIC("pentium_m", "pentium-m", 'K', "+cmov,+mmx,+sse,+sse2")
- CPU_SPECIFIC("pentium_4_sse3", "prescott", 'L', "+cmov,+mmx,+sse,+sse2,+sse3")
- CPU_SPECIFIC("core_2_duo_ssse3", "core2", 'M', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3")
+--- llvm-toolchain-snapshot_17~++20230705085103+4ef04876ef17.orig/llvm/lib/TargetParser/X86TargetParser.cpp
++++ llvm-toolchain-snapshot_17~++20230705085103+4ef04876ef17/llvm/lib/TargetParser/X86TargetParser.cpp
+@@ -132,7 +132,7 @@ constexpr FeatureBitset FeaturesPentium2
+ constexpr FeatureBitset FeaturesPentium3 = FeaturesPentium2 | FeatureSSE;
+ 
+ // Pentium 4 CPUs
+-constexpr FeatureBitset FeaturesPentium4 = FeaturesPentium3 | FeatureSSE2;
++constexpr FeatureBitset FeaturesPentium4 = FeaturesPentium3;
+ constexpr FeatureBitset FeaturesPrescott = FeaturesPentium4 | FeatureSSE3;
+ constexpr FeatureBitset FeaturesNocona =
+     FeaturesPrescott | Feature64BIT | FeatureCMPXCHG16B;
diff --git a/debian/patches/fix-issue-63613.diff b/debian/patches/fix-issue-63613.diff
deleted file mode 100644
index 75896021..00000000
--- a/debian/patches/fix-issue-63613.diff
+++ /dev/null
@@ -1,242 +0,0 @@
-Index: llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/file_descriptor.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35.orig/libcxx/src/filesystem/file_descriptor.h
-+++ llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/file_descriptor.h
-@@ -18,6 +18,7 @@
- 
- #include "error.h"
- #include "posix_compat.h"
-+#include "time_utils.h"
- 
- #if defined(_LIBCPP_WIN32API)
- # define WIN32_LEAN_AND_MEAN
-Index: llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/filesystem_clock.cpp
-===================================================================
---- llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35.orig/libcxx/src/filesystem/filesystem_clock.cpp
-+++ llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/filesystem_clock.cpp
-@@ -11,7 +11,7 @@
- #include <filesystem>
- #include <time.h>
- 
--#include "posix_compat.h" // TimeSpec
-+#include "time_utils.h"
- 
- #if defined(_LIBCPP_WIN32API)
- # define WIN32_LEAN_AND_MEAN
-Index: llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/posix_compat.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35.orig/libcxx/src/filesystem/posix_compat.h
-+++ llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/posix_compat.h
-@@ -81,41 +81,6 @@ _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
- namespace detail {
- 
- #if defined(_LIBCPP_WIN32API)
--// Various C runtime versions (UCRT, or the legacy msvcrt.dll used by
--// some mingw toolchains) provide different stat function implementations,
--// with a number of limitations with respect to what we want from the
--// stat function. Instead provide our own which does exactly what we want,
--// along with our own stat structure and flag macros.
--
--struct TimeSpec {
--  int64_t tv_sec;
--  int64_t tv_nsec;
--};
--struct StatT {
--  unsigned st_mode;
--  TimeSpec st_atim;
--  TimeSpec st_mtim;
--  uint64_t st_dev; // FILE_ID_INFO::VolumeSerialNumber
--  struct FileIdStruct {
--    unsigned char id[16]; // FILE_ID_INFO::FileId
--    bool operator==(const FileIdStruct &other) const {
--      for (int i = 0; i < 16; i++)
--        if (id[i] != other.id[i])
--          return false;
--      return true;
--    }
--  } st_ino;
--  uint32_t st_nlink;
--  uintmax_t st_size;
--};
--
--#else
--using TimeSpec = struct timespec;
--using TimeVal = struct timeval;
--using StatT = struct stat;
--#endif
--
--#if defined(_LIBCPP_WIN32API)
- 
- // Various C runtime header sets provide more or less of these. As we
- // provide our own implementation, undef all potential defines from the
-@@ -157,35 +122,6 @@ using StatT = struct stat;
- 
- #define O_NONBLOCK 0
- 
--
--// There were 369 years and 89 leap days from the Windows epoch
--// (1601) to the Unix epoch (1970).
--#define FILE_TIME_OFFSET_SECS (uint64_t(369 * 365 + 89) * (24 * 60 * 60))
--
--inline TimeSpec filetime_to_timespec(LARGE_INTEGER li) {
--  TimeSpec ret;
--  ret.tv_sec = li.QuadPart / 10000000 - FILE_TIME_OFFSET_SECS;
--  ret.tv_nsec = (li.QuadPart % 10000000) * 100;
--  return ret;
--}
--
--inline TimeSpec filetime_to_timespec(FILETIME ft) {
--  LARGE_INTEGER li;
--  li.LowPart = ft.dwLowDateTime;
--  li.HighPart = ft.dwHighDateTime;
--  return filetime_to_timespec(li);
--}
--
--inline FILETIME timespec_to_filetime(TimeSpec ts) {
--  LARGE_INTEGER li;
--  li.QuadPart =
--      ts.tv_nsec / 100 + (ts.tv_sec + FILE_TIME_OFFSET_SECS) * 10000000;
--  FILETIME ft;
--  ft.dwLowDateTime = li.LowPart;
--  ft.dwHighDateTime = li.HighPart;
--  return ft;
--}
--
- inline int set_errno(int e = GetLastError()) {
-   errno = static_cast<int>(__win_err_to_errc(e));
-   return -1;
-Index: llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/time_utils.h
-===================================================================
---- llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35.orig/libcxx/src/filesystem/time_utils.h
-+++ llvm-toolchain-snapshot_17~++20230701095046+dc6c8b8d1e35/libcxx/src/filesystem/time_utils.h
-@@ -21,13 +21,14 @@
- 
- #include "error.h"
- #include "format_string.h"
--#include "posix_compat.h"
- 
- #if defined(_LIBCPP_WIN32API)
- # define WIN32_LEAN_AND_MEAN
- # define NOMINMAX
- # include <windows.h>
- #else
-+# include <fcntl.h>
-+# include <sys/stat.h>
- # include <sys/time.h> // for ::utimes as used in __last_write_time
- #endif
- 
-@@ -40,6 +41,82 @@ _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
- 
- namespace detail {
- 
-+#if defined(_LIBCPP_WIN32API)
-+// Various C runtime versions (UCRT, or the legacy msvcrt.dll used by
-+// some mingw toolchains) provide different stat function implementations,
-+// with a number of limitations with respect to what we want from the
-+// stat function. Instead provide our own which does exactly what we want,
-+// along with our own stat structure and flag macros.
-+
-+struct TimeSpec {
-+  int64_t tv_sec;
-+  int64_t tv_nsec;
-+};
-+struct StatT {
-+  unsigned st_mode;
-+  TimeSpec st_atim;
-+  TimeSpec st_mtim;
-+  uint64_t st_dev; // FILE_ID_INFO::VolumeSerialNumber
-+  struct FileIdStruct {
-+    unsigned char id[16]; // FILE_ID_INFO::FileId
-+    bool operator==(const FileIdStruct &other) const {
-+      for (int i = 0; i < 16; i++)
-+        if (id[i] != other.id[i])
-+          return false;
-+      return true;
-+    }
-+  } st_ino;
-+  uint32_t st_nlink;
-+  uintmax_t st_size;
-+};
-+
-+// There were 369 years and 89 leap days from the Windows epoch
-+// (1601) to the Unix epoch (1970).
-+#define FILE_TIME_OFFSET_SECS (uint64_t(369 * 365 + 89) * (24 * 60 * 60))
-+
-+inline TimeSpec filetime_to_timespec(LARGE_INTEGER li) {
-+  TimeSpec ret;
-+  ret.tv_sec = li.QuadPart / 10000000 - FILE_TIME_OFFSET_SECS;
-+  ret.tv_nsec = (li.QuadPart % 10000000) * 100;
-+  return ret;
-+}
-+
-+inline TimeSpec filetime_to_timespec(FILETIME ft) {
-+  LARGE_INTEGER li;
-+  li.LowPart = ft.dwLowDateTime;
-+  li.HighPart = ft.dwHighDateTime;
-+  return filetime_to_timespec(li);
-+}
-+
-+inline FILETIME timespec_to_filetime(TimeSpec ts) {
-+  LARGE_INTEGER li;
-+  li.QuadPart =
-+      ts.tv_nsec / 100 + (ts.tv_sec + FILE_TIME_OFFSET_SECS) * 10000000;
-+  FILETIME ft;
-+  ft.dwLowDateTime = li.LowPart;
-+  ft.dwHighDateTime = li.HighPart;
-+  return ft;
-+}
-+
-+#else
-+using TimeSpec = struct timespec;
-+using TimeVal = struct timeval;
-+using StatT = struct stat;
-+
-+inline TimeVal make_timeval(TimeSpec const& ts) {
-+  using namespace chrono;
-+  auto Convert = [](long nsec) {
-+    using int_type = decltype(std::declval<TimeVal>().tv_usec);
-+    auto dur = duration_cast<microseconds>(nanoseconds(nsec)).count();
-+    return static_cast<int_type>(dur);
-+  };
-+  TimeVal TV = {};
-+  TV.tv_sec = ts.tv_sec;
-+  TV.tv_usec = Convert(ts.tv_nsec);
-+  return TV;
-+}
-+#endif
-+
- using chrono::duration;
- using chrono::duration_cast;
- 
-@@ -252,20 +329,9 @@ inline TimeSpec extract_mtime(StatT cons
- inline TimeSpec extract_atime(StatT const& st) { return st.st_atim; }
- #endif
- 
--#if !defined(_LIBCPP_WIN32API)
--inline TimeVal make_timeval(TimeSpec const& ts) {
--  using namespace chrono;
--  auto Convert = [](long nsec) {
--    using int_type = decltype(std::declval<TimeVal>().tv_usec);
--    auto dur = duration_cast<microseconds>(nanoseconds(nsec)).count();
--    return static_cast<int_type>(dur);
--  };
--  TimeVal TV = {};
--  TV.tv_sec = ts.tv_sec;
--  TV.tv_usec = Convert(ts.tv_nsec);
--  return TV;
--}
-+#ifndef _LIBCPP_HAS_NO_FILESYSTEM
- 
-+#if !defined(_LIBCPP_WIN32API)
- inline bool posix_utimes(const path& p, std::array<TimeSpec, 2> const& TS,
-                   error_code& ec) {
-   TimeVal ConvertedTS[2] = {make_timeval(TS[0]), make_timeval(TS[1])};
-@@ -310,6 +376,8 @@ inline file_time_type __extract_last_wri
-   return fs_time::convert_from_timespec(ts);
- }
- 
-+#endif // !_LIBCPP_HAS_NO_FILESYSTEM
-+
- } // end namespace detail
- 
- _LIBCPP_END_NAMESPACE_FILESYSTEM
diff --git a/debian/patches/series b/debian/patches/series
index 080a2b99..f2744617 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,5 +148,3 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-
-fix-issue-63613.diff

From e0d40db53cbff054f20009241c18066d95be087f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 6 Jul 2023 17:31:21 +0200
Subject: [PATCH 095/349] rebase of the patches

---
 debian/patches/openmp-fix-runtimes-build.diff | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 8fcbac71..1bdcfcd5 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/llvm/runtimes/CMakeLists.txt
 @@ -236,6 +236,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}
@@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/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_17~++20230603025206+0beffb854209/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/CMakeLists.txt
 @@ -94,6 +94,28 @@ else()
    get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
  endif()
@@ -56,36 +56,36 @@ Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/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_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/CMakeLists.txt
-@@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
-       NO_INSTALL_RPATH
-     )
+--- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
+@@ -62,6 +62,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
+         "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports")
+     endif()
  
 +  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_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-@@ -55,6 +55,8 @@ endif()
- target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
+--- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt
+@@ -68,6 +68,8 @@ target_compile_definitions(omptarget.rtl
+ 
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
 +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda)
 +
  # 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_17~++20230603025206+0beffb854209/openmp/libomptarget/src/CMakeLists.txt
+ set_target_properties(omptarget.rtl.cuda PROPERTIES
+Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/src/CMakeLists.txt
 @@ -36,7 +36,9 @@ add_llvm_library(omptarget
    omp
  
@@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -112,10 +112,10 @@ Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/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_17~++20230603025206+0beffb854209/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/runtime/src/CMakeLists.txt
 @@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/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_17~++20230603025206+0beffb854209/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)

From 7002023066877b3d1763c05aba0e1036eab182dc Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 7 Jul 2023 10:28:06 +0200
Subject: [PATCH 096/349] rebase of the patches

---
 debian/patches/openmp-fix-runtimes-build.diff | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 1bdcfcd5..1d6caad4 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/llvm/runtimes/CMakeLists.txt
 @@ -236,6 +236,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}
@@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/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_17~++20230706052544+13888870e568/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/CMakeLists.txt
 @@ -94,6 +94,28 @@ else()
    get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
  endif()
@@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/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_17~++20230706052544+13888870e568/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
 @@ -62,6 +62,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
          "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports")
      endif()
@@ -69,23 +69,23 @@ Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt
-@@ -68,6 +68,8 @@ target_compile_definitions(omptarget.rtl
- 
- target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
+--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt
+@@ -84,6 +84,8 @@ else()
+                    " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.")
+ endif()
  
 +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda)
 +
  # 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_17~++20230706052544+13888870e568/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/src/CMakeLists.txt
 @@ -36,7 +36,9 @@ add_llvm_library(omptarget
    omp
  
@@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -112,10 +112,10 @@ Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/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_17~++20230706052544+13888870e568/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/src/CMakeLists.txt
 @@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230706052544+13888870e568/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_17~++20230706052544+13888870e568/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230706052544+13888870e568.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230706052544+13888870e568/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)

From 4c5a5bb0af5e0194f606abd67196ca58f9de3660 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 7 Jul 2023 17:52:02 +0200
Subject: [PATCH 097/349] rebase of the patch

---
 .../23-strlcpy_strlcat_warning_removed.diff   | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
index 0aa1f42e..f4e4b681 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_16~++20230123091551+c3737a652230/clang/include/clang/Basic/Builtins.def
+Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/include/clang/Basic/Builtins.def
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/include/clang/Basic/Builtins.def
-+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/include/clang/Basic/Builtins.def
-@@ -626,8 +626,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz
+--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/include/clang/Basic/Builtins.def
++++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/include/clang/Basic/Builtins.def
+@@ -645,8 +645,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_16~++20230123091551+c3737a652230/clang/include/cl
  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")
-@@ -1149,8 +1149,8 @@ LIBBUILTIN(getcontext, "iK*",     "fjT",
+@@ -1179,8 +1179,8 @@ LIBBUILTIN(getcontext, "iK*",     "fjT",
  LIBBUILTIN(_longjmp, "vJi",       "frT",   SETJMP_H, ALL_GNU_LANGUAGES)
  LIBBUILTIN(siglongjmp, "vSJi",    "frT",   SETJMP_H, ALL_GNU_LANGUAGES)
  // non-standard but very common
@@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/include/cl
  //   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_16~++20230123091551+c3737a652230/clang/lib/AST/Decl.cpp
+Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/AST/Decl.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/lib/AST/Decl.cpp
-+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/AST/Decl.cpp
-@@ -4175,13 +4175,13 @@ unsigned FunctionDecl::getMemoryFunction
+--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/AST/Decl.cpp
++++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/AST/Decl.cpp
+@@ -4276,13 +4276,13 @@ unsigned FunctionDecl::getMemoryFunction
    case Builtin::BImemmove:
      return Builtin::BImemmove;
  
@@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/AST/De
  
    case Builtin::BI__builtin_memcmp:
    case Builtin::BImemcmp:
-Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/SemaChecking.cpp
+Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/SemaChecking.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/lib/Sema/SemaChecking.cpp
-+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/SemaChecking.cpp
-@@ -1264,8 +1264,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
+--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/Sema/SemaChecking.cpp
++++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/SemaChecking.cpp
+@@ -1265,8 +1265,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_16~++20230123091551+c3737a652230/clang/lib/Sema/S
    case Builtin::BI__builtin___strncat_chk:
    case Builtin::BI__builtin___strncpy_chk:
    case Builtin::BI__builtin___stpncpy_chk:
-@@ -6087,10 +6087,10 @@ bool Sema::CheckFunctionCall(FunctionDec
+@@ -6382,10 +6382,10 @@ bool Sema::CheckFunctionCall(FunctionDec
    switch (CMId) {
    case 0:
      return false;
@@ -85,11 +85,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/S
    case Builtin::BIstrncat:
      CheckStrncatArguments(TheCall, FnInfo);
      break;
-Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
-+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
-@@ -652,10 +652,10 @@ void GenericTaintChecker::initTaintRules
+--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
++++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+@@ -717,10 +717,10 @@ void GenericTaintChecker::initTaintRules
  
        {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}},
         TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})},
@@ -102,11 +102,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Static
        {{CDF_MaybeBuiltin, {{"snprintf"}}},
         TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})},
        {{CDF_MaybeBuiltin, {{"sprintf"}}},
-Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/builtins.c
+Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/builtins.c
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/test/Sema/builtins.c
-+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/builtins.c
-@@ -197,12 +197,10 @@ void test18(void) {
+--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/test/Sema/builtins.c
++++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/builtins.c
+@@ -194,12 +194,10 @@ void test18(void) {
    void *ptr;
  
    ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
@@ -119,26 +119,27 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/
  }
  
  void no_ms_builtins(void) {
-@@ -217,6 +215,7 @@ void unavailable(void) {
+@@ -212,7 +210,7 @@ void unavailable(void) {
+   __builtin_operator_new(0); // expected-error {{'__builtin_operator_new' is only available in C++}}
+   __builtin_operator_delete(0); // expected-error {{'__builtin_operator_delete' is only available in C++}}
  }
- 
- // rdar://18259539
+-
 +/*
  size_t strlcpy(char * restrict dst, const char * restrict src, size_t size);
  size_t strlcat(char * restrict dst, const char * restrict src, size_t size);
  
-@@ -238,6 +237,7 @@ void Test19(void)
+@@ -234,6 +232,7 @@ void Test19(void)
                                                                                     // expected-note {{change size argument to be the size of the destination}} \
  				                                                   // expected-warning {{'strlcat' will always overflow; destination buffer has size 20, but size argument is 40}}
  }
 +*/
  
- // rdar://11076881
  char * Test20(char *p, const char *in, unsigned n)
-Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/warn-strlcpycat-size.c
+ {
+Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/warn-strlcpycat-size.c
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/test/Sema/warn-strlcpycat-size.c
-+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/warn-strlcpycat-size.c
+--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/test/Sema/warn-strlcpycat-size.c
++++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/warn-strlcpycat-size.c
 @@ -1,55 +0,0 @@
 -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
 -

From a92d55f2528b907482c44e9299d03796659b54d6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 8 Jul 2023 16:12:09 +0200
Subject: [PATCH 098/349] remove empty lines

---
 debian/libclang-common-X.Y-dev.install.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
index 89fbf8a3..ece04c4f 100644
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
@@ -1,5 +1,3 @@
-
-
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/

From 248c65788848c2fc5ea47f21fef4c754b1064723 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 8 Jul 2023 16:13:23 +0200
Subject: [PATCH 099/349] Install
 usr/lib/llvm-17/lib/clang/17/include/llvm_libc_wrappers/*.h in
 libclang-common-X.Y-dev

---
 debian/changelog                          | 7 +++++++
 debian/libclang-common-X.Y-dev.install.in | 1 +
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e13f908e..783ad6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-snapshot (1:17~++20230603110125+d072d110227d-1~exp2) UNRELEASED; urgency=medium
+
+  * Install usr/lib/llvm-17/lib/clang/17/include/llvm_libc_wrappers/*.h
+    in libclang-common-X.Y-dev
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 08 Jul 2023 16:12:47 +0200
+
 llvm-toolchain-snapshot (1:17~++20230603110125+d072d110227d-1~exp1) experimental; urgency=medium
 
   * llvm-debuginfod not installed anymore
diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
index ece04c4f..89cfed01 100644
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
@@ -5,3 +5,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/
+usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/llvm_libc_wrappers/*.h

From 4ae72525dd09f1338f09b515e836637002aa2ed6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 9 Jul 2023 15:01:06 +0200
Subject: [PATCH 100/349] refresh of the openmp symbols

---
 debian/libomp5-X.Y.symbols.in | 83 +++++------------------------------
 1 file changed, 10 insertions(+), 73 deletions(-)

diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in
index b0e08c89..45daca66 100644
--- a/debian/libomp5-X.Y.symbols.in
+++ b/debian/libomp5-X.Y.symbols.in
@@ -808,6 +808,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_begin@VERSION 0.20130412
  __kmpc_bound_num_threads@VERSION 0.20130412
  __kmpc_bound_thread_num@VERSION 0.20130412
+ __kmpc_calc_original_ivs_rectang@VERSION 17
  __kmpc_calloc@VERSION 12
  __kmpc_cancel@VERSION 0.20131209
  __kmpc_cancel_barrier@VERSION 0.20131209
@@ -858,6 +859,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_end_taskgroup@VERSION 0.20130412
  __kmpc_error@VERSION 13
  __kmpc_flush@VERSION 0.20130412
+ __kmpc_for_collapsed_init@VERSION 17
  __kmpc_for_static_fini@VERSION 0.20130412
  __kmpc_for_static_init_4@VERSION 0.20130412
  __kmpc_for_static_init_4u@VERSION 0.20130412
@@ -901,6 +903,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_ordered@VERSION 0.20130412
  __kmpc_pause_resource@VERSION 9
  __kmpc_pop_num_threads@VERSION 0.20130412
+ __kmpc_process_loop_nest_rectang@VERSION 17
  __kmpc_proxy_task_completed@VERSION 0.20150401
  __kmpc_proxy_task_completed_ooo@VERSION 0.20150401
  __kmpc_push_num_teams@VERSION 0.20130715
@@ -1342,7 +1345,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  ompc_set_schedule@VERSION 0.20130412
  ompt_libomp_connect@VERSION 17
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)ompt_start_tool@VERSION 6.0
-libomptarget.rtl.amdgpu.nextgen.so.17 libomp5-17 #MINVER#
+libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
  VERS1.0@VERS1.0 17
  __tgt_rtl_create_event@VERS1.0 17
  __tgt_rtl_data_alloc@VERS1.0 17
@@ -1379,28 +1382,7 @@ libomptarget.rtl.amdgpu.nextgen.so.17 libomp5-17 #MINVER#
  __tgt_rtl_sync_event@VERS1.0 17
  __tgt_rtl_synchronize@VERS1.0 17
  __tgt_rtl_wait_event@VERS1.0 17
-libomptarget.rtl.amdgpu.so.17 libomp5-17 #MINVER#
- VERS1.0@VERS1.0 17
- __tgt_rtl_data_alloc@VERS1.0 17
- __tgt_rtl_data_delete@VERS1.0 17
- __tgt_rtl_data_lock@VERS1.0 17
- __tgt_rtl_data_retrieve@VERS1.0 17
- __tgt_rtl_data_retrieve_async@VERS1.0 17
- __tgt_rtl_data_submit@VERS1.0 17
- __tgt_rtl_data_submit_async@VERS1.0 17
- __tgt_rtl_data_unlock@VERS1.0 17
- __tgt_rtl_deinit_plugin@VERS1.0 17
- __tgt_rtl_init_device@VERS1.0 17
- __tgt_rtl_init_plugin@VERS1.0 17
- __tgt_rtl_init_requires@VERS1.0 17
- __tgt_rtl_is_valid_binary@VERS1.0 17
- __tgt_rtl_is_valid_binary_info@VERS1.0 17
- __tgt_rtl_launch_kernel@VERS1.0 17
- __tgt_rtl_load_binary@VERS1.0 17
- __tgt_rtl_number_of_devices@VERS1.0 17
- __tgt_rtl_print_device_info@VERS1.0 17
- __tgt_rtl_synchronize@VERS1.0 17
-libomptarget.rtl.cuda.nextgen.so.17 libomp5-17 #MINVER#
+libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
  VERS1.0@VERS1.0 17
  __tgt_rtl_create_event@VERS1.0 17
  __tgt_rtl_data_alloc@VERS1.0 17
@@ -1437,44 +1419,8 @@ libomptarget.rtl.cuda.nextgen.so.17 libomp5-17 #MINVER#
  __tgt_rtl_sync_event@VERS1.0 17
  __tgt_rtl_synchronize@VERS1.0 17
  __tgt_rtl_wait_event@VERS1.0 17
-libomptarget.rtl.cuda.so.17 libomp5-17 #MINVER#
+libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
  VERS1.0@VERS1.0 17
- __tgt_rtl_create_event@VERS1.0 17
- __tgt_rtl_data_alloc@VERS1.0 17
- __tgt_rtl_data_delete@VERS1.0 17
- __tgt_rtl_data_exchange@VERS1.0 17
- __tgt_rtl_data_exchange_async@VERS1.0 17
- __tgt_rtl_data_retrieve@VERS1.0 17
- __tgt_rtl_data_retrieve_async@VERS1.0 17
- __tgt_rtl_data_submit@VERS1.0 17
- __tgt_rtl_data_submit_async@VERS1.0 17
- __tgt_rtl_deinit_device@VERS1.0 17
- __tgt_rtl_destroy_event@VERS1.0 17
- __tgt_rtl_init_async_info@VERS1.0 17
- __tgt_rtl_init_device@VERS1.0 17
- __tgt_rtl_init_device_info@VERS1.0 17
- __tgt_rtl_init_requires@VERS1.0 17
- __tgt_rtl_is_data_exchangable@VERS1.0 17
- __tgt_rtl_is_valid_binary@VERS1.0 17
- __tgt_rtl_is_valid_binary_info@VERS1.0 17
- __tgt_rtl_launch_kernel@VERS1.0 17
- __tgt_rtl_load_binary@VERS1.0 17
- __tgt_rtl_number_of_devices@VERS1.0 17
- __tgt_rtl_print_device_info@VERS1.0 17
- __tgt_rtl_query_async@VERS1.0 17
- __tgt_rtl_record_event@VERS1.0 17
- __tgt_rtl_release_async_info@VERS1.0 17
- __tgt_rtl_run_target_region@VERS1.0 17
- __tgt_rtl_run_target_region_async@VERS1.0 17
- __tgt_rtl_run_target_team_region@VERS1.0 17
- __tgt_rtl_run_target_team_region_async@VERS1.0 17
- __tgt_rtl_set_info_flag@VERS1.0 17
- __tgt_rtl_sync_event@VERS1.0 17
- __tgt_rtl_synchronize@VERS1.0 17
- __tgt_rtl_wait_event@VERS1.0 17
-libomptarget.rtl.x86_64.nextgen.so.17 libomp5-17 #MINVER#
- VERS1.0@VERS1.0 17
- __tgt_rtl_create_event@VERS1.0 17
  __tgt_rtl_data_alloc@VERS1.0 17
  __tgt_rtl_data_delete@VERS1.0 17
  __tgt_rtl_data_exchange@VERS1.0 17
@@ -1509,19 +1455,7 @@ libomptarget.rtl.x86_64.nextgen.so.17 libomp5-17 #MINVER#
  __tgt_rtl_sync_event@VERS1.0 17
  __tgt_rtl_synchronize@VERS1.0 17
  __tgt_rtl_wait_event@VERS1.0 17
-libomptarget.rtl.x86_64.so.17 libomp5-17 #MINVER#
- VERS1.0@VERS1.0 17
- __tgt_rtl_data_alloc@VERS1.0 17
- __tgt_rtl_data_delete@VERS1.0 17
- __tgt_rtl_data_retrieve@VERS1.0 17
- __tgt_rtl_data_submit@VERS1.0 17
- __tgt_rtl_init_device@VERS1.0 17
- __tgt_rtl_is_valid_binary@VERS1.0 17
- __tgt_rtl_launch_kernel@VERS1.0 17
- __tgt_rtl_load_binary@VERS1.0 17
- __tgt_rtl_number_of_devices@VERS1.0 17
- __tgt_rtl_print_device_info@VERS1.0 17
-libomptarget.so.17 libomp5-17 #MINVER#
+libomptarget.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
  VERS1.0@VERS1.0 17
  __kmpc_push_target_tripcount@VERS1.0 17
  __kmpc_push_target_tripcount_mapper@VERS1.0 17
@@ -1584,4 +1518,7 @@ libomptarget.so.17 libomp5-17 #MINVER#
  omp_target_free@VERS1.0 17
  omp_target_is_present@VERS1.0 17
  omp_target_memcpy@VERS1.0 17
+ omp_target_memcpy_async@VERS1.0 17
  omp_target_memcpy_rect@VERS1.0 17
+ omp_target_memcpy_rect_async@VERS1.0 17
+ ompt_libomptarget_connect@VERS1.0 17

From b773dd1c96ce753f306a9525733a147d8c1c8047 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 9 Jul 2023 15:16:19 +0200
Subject: [PATCH 101/349] add new libclang symbol

---
 debian/libclang1-X.Y.symbols.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in
index 16a7ec27..23f56eed 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Y.symbols.in
@@ -26,6 +26,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
  clang_CXXMethod_isCopyAssignmentOperator@LLVM_16 1:16.0.2-1~
  clang_CXXMethod_isDefaulted@LLVM_13 1:5.0~svn298832-1~
  clang_CXXMethod_isDeleted@LLVM_16 1:16.0.2-1~
+ clang_CXXMethod_isExplicit@LLVM_17 1:17
  clang_CXXMethod_isMoveAssignmentOperator@LLVM_16 1:16.0.2-1~
  clang_CXXMethod_isPureVirtual@LLVM_13 1:5.0~svn298832-1~
  clang_CXXMethod_isStatic@LLVM_13 1:5.0~svn298832-1~
@@ -191,6 +192,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
  clang_createAPISet@LLVM_16 1:16.0.2-1~
  clang_createCXCursorSet@LLVM_13 1:5.0~svn298832-1~
  clang_createIndex@LLVM_13 1:5.0~svn298832-1~
+ clang_createIndexWithOptions@LLVM_17 1:17-
  clang_createTranslationUnit2@LLVM_13 1:5.0~svn298832-1~
  clang_createTranslationUnit@LLVM_13 1:5.0~svn298832-1~
  clang_createTranslationUnitFromSourceFile@LLVM_13 1:5.0~svn298832-1~
@@ -230,6 +232,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
  clang_getArgType@LLVM_13 1:5.0~svn298832-1~
  clang_getArrayElementType@LLVM_13 1:5.0~svn298832-1~
  clang_getArraySize@LLVM_13 1:5.0~svn298832-1~
+ clang_getBinaryOperatorKindSpelling@LLVM_17 1:17
  clang_getBuildSessionTimestamp@LLVM_13 1:5.0~svn298832-1~
  clang_getCString@LLVM_13 1:5.0~svn298832-1~
  clang_getCXTUResourceUsage@LLVM_13 1:5.0~svn298832-1~
@@ -251,6 +254,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
  clang_getCompletionPriority@LLVM_13 1:5.0~svn298832-1~
  clang_getCursor@LLVM_13 1:5.0~svn298832-1~
  clang_getCursorAvailability@LLVM_13 1:5.0~svn298832-1~
+ clang_getCursorBinaryOperatorKind@LLVM_17 1:17
  clang_getCursorCompletionString@LLVM_13 1:5.0~svn298832-1~
  clang_getCursorDefinition@LLVM_13 1:5.0~svn298832-1~
  clang_getCursorDisplayName@LLVM_13 1:5.0~svn298832-1~
@@ -273,6 +277,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
  clang_getCursorTLSKind@LLVM_13 1:6.0~svn320926-1~
  clang_getCursorType@LLVM_13 1:5.0~svn298832-1~
  clang_getCursorUSR@LLVM_13 1:5.0~svn298832-1~
+ clang_getCursorUnaryOperatorKind@LLVM_17 1:17
  clang_getCursorVisibility@LLVM_13 1:5.0~svn298832-1~
  clang_getDeclObjCTypeEncoding@LLVM_13 1:5.0~svn298832-1~
  clang_getDefinitionSpellingAndExtent@LLVM_13 1:5.0~svn298832-1~
@@ -351,6 +356,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
  clang_getTypeSpelling@LLVM_13 1:5.0~svn298832-1~
  clang_getTypedefDeclUnderlyingType@LLVM_13 1:5.0~svn298832-1~
  clang_getTypedefName@LLVM_13 1:5.0~+rc1~
+ clang_getUnaryOperatorKindSpelling@LLVM_17 1:17
  clang_getUnqualifiedType@LLVM_16 1:16.0.2-1~
  clang_hashCursor@LLVM_13 1:5.0~svn298832-1~
  clang_indexLoc_getCXSourceLocation@LLVM_13 1:5.0~svn298832-1~

From 5322f0340bc1d1017b23975602a83cfe52a5173b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 9 Jul 2023 15:18:05 +0200
Subject: [PATCH 102/349] fix changelog

---
 debian/changelog                | 9 +++++----
 debian/libclang1-X.Y.symbols.in | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 783ad6a0..727121fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-llvm-toolchain-snapshot (1:17~++20230603110125+d072d110227d-1~exp2) UNRELEASED; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230701095046+dc6c8b8d1e35-1~exp2) UNRELEASED; urgency=medium
 
   * Install usr/lib/llvm-17/lib/clang/17/include/llvm_libc_wrappers/*.h
     in libclang-common-X.Y-dev
+  * fix the libclang & libomp5 symbol files
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 08 Jul 2023 16:12:47 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 09 Jul 2023 15:15:34 +0200
 
-llvm-toolchain-snapshot (1:17~++20230603110125+d072d110227d-1~exp1) experimental; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230701095046+dc6c8b8d1e35-1~exp1) experimental; urgency=medium
 
   * llvm-debuginfod not installed anymore
     https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225
@@ -17,7 +18,7 @@ llvm-toolchain-snapshot (1:17~++20230603110125+d072d110227d-1~exp1) experimental
   * Disable python3-lldb-17 for buster (it has been this way for a while)
   * Try to workaround issue 63613
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 09 Jun 2023 13:25:01 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 04 Jul 2023 13:16:48 +0200
 
 llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium
 
diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in
index 23f56eed..b8658cc7 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Y.symbols.in
@@ -1,4 +1,4 @@
-libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
+libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER#
  (optional)LLVM_13@LLVM_13 1:15.0.7-3
  (optional)LLVM_16@LLVM_16 1:16.0.2-1
  clang_BlockCommandComment_getArgText@LLVM_13 1:5.0~svn298832-1~

From 0d2bdf4339495147a75b3ea63dca0ee1cd599ca1 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 9 Jul 2023 15:20:41 +0200
Subject: [PATCH 103/349] fix changelog

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 727121fb..a649eb9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,13 @@ llvm-toolchain-snapshot (1:17~++20230701095046+dc6c8b8d1e35-1~exp2) UNRELEASED;
   * Install usr/lib/llvm-17/lib/clang/17/include/llvm_libc_wrappers/*.h
     in libclang-common-X.Y-dev
   * fix the libclang & libomp5 symbol files
+  * Add new symbol to libclang1:
+    clang_CXXMethod_isExplicit 
+    clang_createIndexWithOptions 
+    clang_getBinaryOperatorKindSpelling 
+    clang_getCursorBinaryOperatorKind 
+    clang_getCursorUnaryOperatorKind 
+    clang_getUnaryOperatorKindSpelling
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 09 Jul 2023 15:15:34 +0200
 

From 08b880a8beb9753697d18f5ff7991c0f7d6f1be0 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 9 Jul 2023 15:21:30 +0200
Subject: [PATCH 104/349] fix whitespaces

---
 debian/changelog | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a649eb9c..f122a2b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,11 @@ llvm-toolchain-snapshot (1:17~++20230701095046+dc6c8b8d1e35-1~exp2) UNRELEASED;
     in libclang-common-X.Y-dev
   * fix the libclang & libomp5 symbol files
   * Add new symbol to libclang1:
-    clang_CXXMethod_isExplicit 
-    clang_createIndexWithOptions 
-    clang_getBinaryOperatorKindSpelling 
-    clang_getCursorBinaryOperatorKind 
-    clang_getCursorUnaryOperatorKind 
+    clang_CXXMethod_isExplicit
+    clang_createIndexWithOptions
+    clang_getBinaryOperatorKindSpelling
+    clang_getCursorBinaryOperatorKind
+    clang_getCursorUnaryOperatorKind
     clang_getUnaryOperatorKindSpelling
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 09 Jul 2023 15:15:34 +0200

From 2c20cbc694f6a5b4ca86fb0e42aec764772de06d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 9 Jul 2023 16:48:23 +0200
Subject: [PATCH 105/349] prepare release

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f122a2b5..3f4b809e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-snapshot (1:17~++20230701095046+dc6c8b8d1e35-1~exp2) UNRELEASED; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental; urgency=medium
 
   * Install usr/lib/llvm-17/lib/clang/17/include/llvm_libc_wrappers/*.h
     in libclang-common-X.Y-dev

From f0229cafdf52af50de2a7cacd08161e88a123181 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 9 Jul 2023 18:36:45 +0200
Subject: [PATCH 106/349] fix symbol

---
 debian/libclang1-X.Y.symbols.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in
index b8658cc7..fb48bedd 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Y.symbols.in
@@ -192,7 +192,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER#
  clang_createAPISet@LLVM_16 1:16.0.2-1~
  clang_createCXCursorSet@LLVM_13 1:5.0~svn298832-1~
  clang_createIndex@LLVM_13 1:5.0~svn298832-1~
- clang_createIndexWithOptions@LLVM_17 1:17-
+ clang_createIndexWithOptions@LLVM_17 1:17
  clang_createTranslationUnit2@LLVM_13 1:5.0~svn298832-1~
  clang_createTranslationUnit@LLVM_13 1:5.0~svn298832-1~
  clang_createTranslationUnitFromSourceFile@LLVM_13 1:5.0~svn298832-1~

From bb3a58f48dc8214cc2a4f4c853a0a7bd4991e07e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 9 Jul 2023 18:37:17 +0200
Subject: [PATCH 107/349] Fix hurd build by fixing Linux-specific lines.

---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 70c43742..c8d80865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental
     clang_getCursorUnaryOperatorKind
     clang_getUnaryOperatorKindSpelling
 
+  [ Samuel Thibault ]
+  * Fix hurd build by fixing Linux-specific lines.
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 09 Jul 2023 15:15:34 +0200
 
 llvm-toolchain-snapshot (1:17~++20230701095046+dc6c8b8d1e35-1~exp1) experimental; urgency=medium

From d26f9b9dc085860551ce476fc30d83b11b1016c7 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 11 Jul 2023 15:05:43 +0200
Subject: [PATCH 108/349] revert patch to fix 63799

---
 debian/patches/revert-move-issue-63799.diff | 1053 +++++++++++++++++++
 debian/patches/series                       |    1 +
 2 files changed, 1054 insertions(+)
 create mode 100644 debian/patches/revert-move-issue-63799.diff

diff --git a/debian/patches/revert-move-issue-63799.diff b/debian/patches/revert-move-issue-63799.diff
new file mode 100644
index 00000000..e956f58d
--- /dev/null
+++ b/debian/patches/revert-move-issue-63799.diff
@@ -0,0 +1,1053 @@
+commit dae9d1b52469daca88a968e7b99a26420aef657c
+Author: Petr Hosek <phosek@google.com>
+Date:   Wed Jun 28 07:14:00 2023 +0000
+
+    [compiler-rt] Move crt into builtins
+    
+    On Linux crt is typically use in combination with builtins. In the Clang
+    driver the use of builtins and crt is controlled by the --rtlib option.
+    Both builtins and crt also have similar build requirements where they
+    need to be built before any other runtimes and must avoid dependencies.
+    We also want builtins and crt these to be buildable separately from the
+    rest of compiler-rt for bootstrapping purposes. Given how simple crt is,
+    rather than maintaining a separate directory with its own separate build
+    setup, it's more efficient to just move crt into builtins. We still use
+    separate CMake option to control whether to built crt same as before.
+    
+    This is an alternative to D89492 and D136664.
+    
+    Differential Revision: https://reviews.llvm.org/D153989
+
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/CMakeLists.txt
+@@ -39,6 +39,10 @@ option(COMPILER_RT_BUILD_BUILTINS "Build
+ mark_as_advanced(COMPILER_RT_BUILD_BUILTINS)
+ option(COMPILER_RT_DISABLE_AARCH64_FMV "Disable AArch64 Function Multi Versioning support" OFF)
+ mark_as_advanced(COMPILER_RT_DISABLE_AARCH64_FMV)
++option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON)
++mark_as_advanced(COMPILER_RT_BUILD_CRT)
++option(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY "Use eh_frame in crtbegin.o/crtend.o" ON)
++mark_as_advanced(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY)
+ option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
+ mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS)
+ option(COMPILER_RT_BUILD_XRAY "Build xray" ON)
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/cmake/builtin-config-ix.cmake
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/cmake/builtin-config-ix.cmake
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/cmake/builtin-config-ix.cmake
+@@ -13,11 +13,6 @@ builtin_check_c_compiler_flag(-fvisibili
+ builtin_check_c_compiler_flag(-fomit-frame-pointer  COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG)
+ builtin_check_c_compiler_flag(-ffreestanding        COMPILER_RT_HAS_FFREESTANDING_FLAG)
+ builtin_check_c_compiler_flag(-fxray-instrument     COMPILER_RT_HAS_XRAY_COMPILER_FLAG)
+-builtin_check_c_compiler_flag(-fno-lto              COMPILER_RT_HAS_FNO_LTO_FLAG)
+-builtin_check_c_compiler_flag(-fno-profile-generate COMPILER_RT_HAS_FNO_PROFILE_GENERATE_FLAG)
+-builtin_check_c_compiler_flag(-fno-profile-instr-generate COMPILER_RT_HAS_FNO_PROFILE_INSTR_GENERATE_FLAG)
+-builtin_check_c_compiler_flag(-fno-profile-instr-use COMPILER_RT_HAS_FNO_PROFILE_INSTR_USE_FLAG)
+-builtin_check_c_compiler_flag(-Wno-pedantic         COMPILER_RT_HAS_WNO_PEDANTIC)
+ 
+ builtin_check_c_compiler_source(COMPILER_RT_HAS_ATOMIC_KEYWORD
+ "
+@@ -33,12 +28,6 @@ asm(\".arch armv8-a+lse\");
+ asm(\"cas w0, w1, [x2]\");
+ ")
+ 
+-if(ANDROID)
+-  set(OS_NAME "Android")
+-else()
+-  set(OS_NAME "${CMAKE_SYSTEM_NAME}")
+-endif()
+-
+ set(ARM64 aarch64)
+ set(ARM32 arm armhf armv4t armv5te armv6 armv6m armv7m armv7em armv7 armv7s armv7k armv8m.base armv8m.main armv8.1m.main)
+ set(AVR avr)
+@@ -225,10 +214,4 @@ else()
+     ${ALL_BUILTIN_SUPPORTED_ARCH})
+ endif()
+ 
+-if (OS_NAME MATCHES "Linux" AND NOT LLVM_USE_SANITIZER)
+-  set(COMPILER_RT_HAS_CRT TRUE)
+-else()
+-  set(COMPILER_RT_HAS_CRT FALSE)
+-endif()
+-
+ message(STATUS "Builtin supported architectures: ${BUILTIN_SUPPORTED_ARCH}")
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/lib/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/CMakeLists.txt
+@@ -17,6 +17,10 @@ if(COMPILER_RT_BUILD_BUILTINS)
+   add_subdirectory(builtins)
+ endif()
+ 
++if(COMPILER_RT_BUILD_CRT)
++  add_subdirectory(crt)
++endif()
++
+ function(compiler_rt_build_runtime runtime)
+   string(TOUPPER ${runtime} runtime_uppercase)
+   if(COMPILER_RT_HAS_${runtime_uppercase})
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/builtins/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/lib/builtins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/builtins/CMakeLists.txt
+@@ -56,9 +56,12 @@ if (COMPILER_RT_STANDALONE_BUILD)
+ endif()
+ 
+ include(builtin-config-ix)
+-include(CMakeDependentOption)
+ include(CMakePushCheckState)
+ 
++if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
++  include(CompilerRTAIXUtils)
++endif()
++
+ option(COMPILER_RT_BUILTINS_HIDE_SYMBOLS
+   "Do not export any symbols from the static library." ON)
+ 
+@@ -692,7 +695,7 @@ set(powerpc64_SOURCES
+   ${GENERIC_SOURCES}
+ )
+ # These routines require __int128, which isn't supported on AIX.
+-if (NOT OS_NAME MATCHES "AIX")
++if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
+   set(powerpc64_SOURCES
+     ppc/floattitf.c
+     ppc/fixtfti.c
+@@ -863,8 +866,6 @@ else ()
+   endforeach ()
+ endif ()
+ 
+-add_dependencies(compiler-rt builtins)
+-
+ option(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC
+   "Build standalone shared atomic library."
+   OFF)
+@@ -872,8 +873,7 @@ option(COMPILER_RT_BUILD_STANDALONE_LIBA
+ if(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC)
+   add_custom_target(builtins-standalone-atomic)
+   set(BUILTIN_TYPE SHARED)
+-  if(OS_NAME MATCHES "AIX")
+-    include(CompilerRTAIXUtils)
++  if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
+     if(NOT COMPILER_RT_LIBATOMIC_LINK_FLAGS)
+       get_aix_libatomic_default_link_flags(COMPILER_RT_LIBATOMIC_LINK_FLAGS
+         "${CMAKE_CURRENT_SOURCE_DIR}/ppc/atomic.exp")
+@@ -898,7 +898,7 @@ if(COMPILER_RT_BUILD_STANDALONE_LIBATOMI
+   # FIXME: On AIX, we have to archive built shared libraries into a static
+   # archive, i.e., libatomic.a. Once cmake adds support of such usage for AIX,
+   # this ad-hoc part can be removed.
+-  if(OS_NAME MATCHES "AIX")
++  if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
+     archive_aix_libatomic(clang_rt.atomic libatomic
+                           ARCHS ${BUILTIN_SUPPORTED_ARCH}
+                           PARENT_TARGET builtins-standalone-atomic)
+@@ -906,40 +906,4 @@ if(COMPILER_RT_BUILD_STANDALONE_LIBATOMI
+   add_dependencies(compiler-rt builtins-standalone-atomic)
+ endif()
+ 
+-cmake_dependent_option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON "COMPILER_RT_HAS_CRT" OFF)
+-
+-if(COMPILER_RT_BUILD_CRT)
+-  add_compiler_rt_component(crt)
+-
+-  option(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY "Use eh_frame in crtbegin.o/crtend.o" ON)
+-
+-  include(CheckSectionExists)
+-  check_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
+-    SOURCE "volatile int x;\n__attribute__((constructor)) void f(void) {x = 0;}\nint main(void) { return 0; }\n")
+-
+-  append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 CRT_CFLAGS)
+-  append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
+-  append_list_if(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY -DEH_USE_FRAME_REGISTRY CRT_CFLAGS)
+-  append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS)
+-  append_list_if(COMPILER_RT_HAS_WNO_PEDANTIC -Wno-pedantic CRT_CFLAGS)
+-  if (COMPILER_RT_HAS_FCF_PROTECTION_FLAG)
+-    append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full CRT_CFLAGS)
+-  endif()
+-
+-  foreach(arch ${BUILTIN_SUPPORTED_ARCH})
+-    add_compiler_rt_runtime(clang_rt.crtbegin
+-      OBJECT
+-      ARCHS ${arch}
+-      SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c
+-      CFLAGS ${CRT_CFLAGS}
+-      PARENT_TARGET crt)
+-    add_compiler_rt_runtime(clang_rt.crtend
+-      OBJECT
+-      ARCHS ${arch}
+-      SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c
+-      CFLAGS ${CRT_CFLAGS}
+-      PARENT_TARGET crt)
+-  endforeach()
+-
+-  add_dependencies(compiler-rt crt)
+-endif()
++add_dependencies(compiler-rt builtins)
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/CMakeLists.txt
+===================================================================
+--- /dev/null
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/CMakeLists.txt
+@@ -0,0 +1,63 @@
++if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
++  cmake_minimum_required(VERSION 3.20.0)
++
++  set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
++  project(CompilerRTCRT C)
++  set(COMPILER_RT_STANDALONE_BUILD TRUE)
++  set(COMPILER_RT_CRT_STANDALONE_BUILD TRUE)
++
++  set(COMPILER_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
++
++  set(LLVM_COMMON_CMAKE_UTILS "${COMPILER_RT_SOURCE_DIR}/../cmake")
++
++  # Add path for custom modules
++  list(INSERT CMAKE_MODULE_PATH 0
++    "${COMPILER_RT_SOURCE_DIR}/cmake"
++    "${COMPILER_RT_SOURCE_DIR}/cmake/Modules"
++    "${LLVM_COMMON_CMAKE_UTILS}"
++    "${LLVM_COMMON_CMAKE_UTILS}/Modules"
++    )
++
++  include(base-config-ix)
++  include(CompilerRTUtils)
++
++  load_llvm_config()
++  construct_compiler_rt_default_triple()
++
++  include(SetPlatformToolchainTools)
++  include(AddCompilerRT)
++endif()
++
++include(crt-config-ix)
++
++if(COMPILER_RT_HAS_CRT)
++  add_compiler_rt_component(crt)
++
++  include(CheckSectionExists)
++  check_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
++    SOURCE "volatile int x;\n__attribute__((constructor)) void f(void) {x = 0;}\nint main(void) { return 0; }\n")
++
++  append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 CRT_CFLAGS)
++  append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
++  append_list_if(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY -DEH_USE_FRAME_REGISTRY CRT_CFLAGS)
++  append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS)
++  append_list_if(COMPILER_RT_HAS_WNO_PEDANTIC -Wno-pedantic CRT_CFLAGS)
++  if (COMPILER_RT_HAS_FCF_PROTECTION_FLAG)
++    append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full CRT_CFLAGS)
++  endif()
++
++  foreach(arch ${CRT_SUPPORTED_ARCH})
++    add_compiler_rt_runtime(clang_rt.crtbegin
++      OBJECT
++      ARCHS ${arch}
++      SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c
++      CFLAGS ${CRT_CFLAGS}
++      PARENT_TARGET crt)
++    add_compiler_rt_runtime(clang_rt.crtend
++      OBJECT
++      ARCHS ${arch}
++      SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c
++      CFLAGS ${CRT_CFLAGS}
++      PARENT_TARGET crt)
++  endforeach()
++endif()
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/CMakeLists.txt
+@@ -103,6 +103,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
+   if(COMPILER_RT_BUILD_ORC)
+     compiler_rt_Test_runtime(orc)
+   endif()
++  if(COMPILER_RT_BUILD_CRT)
++    add_subdirectory(crt)
++  endif()
+   # ShadowCallStack does not yet provide a runtime with compiler-rt, the tests
+   # include their own minimal runtime
+   add_subdirectory(shadowcallstack)
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/CMakeLists.txt
+@@ -13,10 +13,6 @@ configure_lit_site_cfg(
+ 
+ include(builtin-config-ix)
+ 
+-if (COMPILER_RT_HAS_CRT)
+-  list(APPEND BUILTINS_TEST_DEPS crt)
+-endif()
+-
+ # Indicate if this is an MSVC environment.
+ pythonize_bool(MSVC)
+ 
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/lit.cfg.py
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/Unit/lit.cfg.py
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/lit.cfg.py
+@@ -2,8 +2,6 @@
+ 
+ import os
+ import platform
+-import shlex
+-import subprocess
+ 
+ import lit.formats
+ 
+@@ -30,40 +28,6 @@ def get_required_attr(config, attr_name)
+     return attr_value
+ 
+ 
+-def get_library_path(file):
+-    cmd = subprocess.Popen(
+-        [config.clang.strip(), "-print-file-name=%s" % file]
+-        + shlex.split(config.target_cflags),
+-        stdout=subprocess.PIPE,
+-        env=config.environment,
+-        universal_newlines=True,
+-    )
+-    if not cmd.stdout:
+-        lit_config.fatal("Couldn't find the library path for '%s'" % file)
+-    dir = cmd.stdout.read().strip()
+-    if sys.platform in ["win32"] and execute_external:
+-        # Don't pass dosish path separator to msys bash.exe.
+-        dir = dir.replace("\\", "/")
+-    return dir
+-
+-
+-def get_libgcc_file_name():
+-    cmd = subprocess.Popen(
+-        [config.clang.strip(), "-print-libgcc-file-name"]
+-        + shlex.split(config.target_cflags),
+-        stdout=subprocess.PIPE,
+-        env=config.environment,
+-        universal_newlines=True,
+-    )
+-    if not cmd.stdout:
+-        lit_config.fatal("Couldn't find the library path for '%s'" % file)
+-    dir = cmd.stdout.read().strip()
+-    if sys.platform in ["win32"] and execute_external:
+-        # Don't pass dosish path separator to msys bash.exe.
+-        dir = dir.replace("\\", "/")
+-    return dir
+-
+-
+ # Setup config name.
+ config.name = "Builtins" + config.name_suffix
+ 
+@@ -106,27 +70,6 @@ else:
+         base_lib = base_lib.replace("\\", "/")
+     config.substitutions.append(("%librt ", base_lib + " -lc -lm "))
+ 
+-    if config.host_os == "Linux":
+-        base_obj = os.path.join(
+-            config.compiler_rt_libdir, "clang_rt.%%s%s.o" % config.target_suffix
+-        )
+-        if sys.platform in ["win32"] and execute_external:
+-            # Don't pass dosish path separator to msys bash.exe.
+-            base_obj = base_obj.replace("\\", "/")
+-
+-        config.substitutions.append(("%crtbegin", base_obj % "crtbegin"))
+-        config.substitutions.append(("%crtend", base_obj % "crtend"))
+-
+-        config.substitutions.append(("%crt1", get_library_path("crt1.o")))
+-        config.substitutions.append(("%crti", get_library_path("crti.o")))
+-        config.substitutions.append(("%crtn", get_library_path("crtn.o")))
+-
+-        config.substitutions.append(("%libgcc", get_libgcc_file_name()))
+-
+-        config.substitutions.append(
+-            ("%libstdcxx", "-l" + config.sanitizer_cxx_lib.lstrip("lib"))
+-        )
+-
+ builtins_source_dir = os.path.join(
+     get_required_attr(config, "compiler_rt_src_root"), "lib", "builtins"
+ )
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in
+@@ -4,7 +4,6 @@ config.name_suffix = "@BUILTINS_TEST_CON
+ config.builtins_lit_source_dir = "@BUILTINS_LIT_SOURCE_DIR@/Unit"
+ config.target_cflags = "@BUILTINS_TEST_TARGET_CFLAGS@"
+ config.target_arch = "@BUILTINS_TEST_TARGET_ARCH@"
+-config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@"
+ config.is_msvc = @MSVC_PYBOOL@
+ config.builtins_is_msvc = @BUILTINS_IS_MSVC_PYBOOL@
+ config.builtins_lit_source_features = "@BUILTINS_LIT_SOURCE_FEATURES@"
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/CMakeLists.txt
+===================================================================
+--- /dev/null
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/CMakeLists.txt
+@@ -0,0 +1,41 @@
++include(crt-config-ix)
++
++if (COMPILER_RT_HAS_CRT)
++  set(CRT_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
++
++  if(NOT COMPILER_RT_STANDALONE_BUILD)
++    list(APPEND CRT_TEST_DEPS crt)
++  endif()
++  if(NOT COMPILER_RT_STANDALONE_BUILD AND NOT LLVM_RUNTIMES_BUILD)
++    # Use LLVM utils and Clang from the same build tree.
++    list(APPEND CRT_TEST_DEPS
++      clang clang-resource-headers FileCheck not llvm-config)
++  endif()
++
++  set(CRT_TEST_ARCH ${CRT_SUPPORTED_ARCH})
++  foreach(arch ${CRT_TEST_ARCH})
++    set(CRT_TEST_TARGET_ARCH ${arch})
++    string(TOLOWER "-${arch}-${OS_NAME}" CRT_TEST_CONFIG_SUFFIX)
++    get_test_cc_for_arch(${arch} CRT_TEST_TARGET_CC CRT_TEST_TARGET_CFLAGS)
++    string(TOUPPER ${arch} ARCH_UPPER_CASE)
++    set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)
++
++    if (COMPILER_RT_ENABLE_CET)
++      if (${arch} MATCHES "i386|x86_64")
++        list(APPEND CRT_TEST_TARGET_CFLAGS -fcf-protection=full)
++        string(REPLACE ";" " " CRT_TEST_TARGET_CFLAGS "${CRT_TEST_TARGET_CFLAGS}")
++      else()
++        message(FATAL_ERROR "The target arch ${arch} doesn't support CET")
++      endif()
++    endif()
++    configure_lit_site_cfg(
++      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
++      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py)
++    list(APPEND CRT_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
++  endforeach()
++
++  add_lit_testsuite(check-crt "Running the CRT tests"
++    ${CRT_TESTSUITES}
++    DEPENDS ${CRT_TEST_DEPS})
++  set_target_properties(check-crt PROPERTIES FOLDER "Compiler-RT Misc")
++endif()
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/ctor_dtor.c
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/Unit/ctor_dtor.c
++++ /dev/null
+@@ -1,43 +0,0 @@
+-// REQUIRES: linux
+-
+-// RUN: %clang -fno-use-init-array -g -c %s -o %t.o
+-// RUN: %clang -o %t -no-pie -nostdlib %crt1 %crti %crtbegin %t.o -lc %libgcc %crtend %crtn
+-// RUN: %run %t 2>&1 | FileCheck %s
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-
+-// Ensure the various startup functions are called in the proper order.
+-
+-// CHECK: __register_frame_info()
+-/// ctor() is here if ld.so/libc supports DT_INIT/DT_FINI
+-// CHECK:      main()
+-/// dtor() is here if ld.so/libc supports DT_INIT/DT_FINI
+-// CHECK:      __deregister_frame_info()
+-
+-struct object;
+-static int counter;
+-
+-void __register_frame_info(const void *fi, struct object *obj) {
+-  printf("__register_frame_info()\n");
+-}
+-
+-void __deregister_frame_info(const void *fi) {
+-  printf("__deregister_frame_info()\n");
+-}
+-
+-void __attribute__((constructor)) ctor() {
+-  printf("ctor()\n");
+-  ++counter;
+-}
+-
+-void __attribute__((destructor)) dtor() {
+-  printf("dtor()\n");
+-  if (--counter != 0)
+-    abort();
+-}
+-
+-int main() {
+-  printf("main()\n");
+-  return 0;
+-}
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/ctor_dtor.c
+===================================================================
+--- /dev/null
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/ctor_dtor.c
+@@ -0,0 +1,41 @@
++// RUN: %clang -fno-use-init-array -g -c %s -o %t.o
++// RUN: %clang -o %t -no-pie -nostdlib %crt1 %crti %crtbegin %t.o -lc %libgcc %crtend %crtn
++// RUN: %run %t 2>&1 | FileCheck %s
++
++#include <stdio.h>
++#include <stdlib.h>
++
++// Ensure the various startup functions are called in the proper order.
++
++// CHECK: __register_frame_info()
++/// ctor() is here if ld.so/libc supports DT_INIT/DT_FINI
++// CHECK:      main()
++/// dtor() is here if ld.so/libc supports DT_INIT/DT_FINI
++// CHECK:      __deregister_frame_info()
++
++struct object;
++static int counter;
++
++void __register_frame_info(const void *fi, struct object *obj) {
++  printf("__register_frame_info()\n");
++}
++
++void __deregister_frame_info(const void *fi) {
++  printf("__deregister_frame_info()\n");
++}
++
++void __attribute__((constructor)) ctor() {
++  printf("ctor()\n");
++  ++counter;
++}
++
++void __attribute__((destructor)) dtor() {
++  printf("dtor()\n");
++  if (--counter != 0)
++    abort();
++}
++
++int main() {
++  printf("main()\n");
++  return 0;
++}
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/dso_handle.cpp
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/Unit/dso_handle.cpp
++++ /dev/null
+@@ -1,37 +0,0 @@
+-// REQUIRES: linux
+-
+-// RUN: %clangxx -g -fno-exceptions -DCRT_SHARED -c %s -fPIC -o %tshared.o
+-// RUN: %clangxx -g -fno-exceptions -c %s -fPIC -o %t.o
+-// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %crtbegin %tshared.o %libstdcxx -lc -lm %libgcc %crtend %crtn
+-// RUN: %clangxx -g -o %t -fno-pic -no-pie -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn
+-// RUN: %run %t 2>&1 | FileCheck %s
+-
+-// UNSUPPORTED: target={{(arm|aarch64).*}}
+-
+-#include <stdio.h>
+-
+-// CHECK: 1
+-// CHECK-NEXT: ~A()
+-
+-#ifdef CRT_SHARED
+-bool G;
+-void C() {
+-  printf("%d\n", G);
+-}
+-
+-struct A {
+-  A() { G = true; }
+-  ~A() {
+-    printf("~A()\n");
+-  }
+-};
+-
+-A a;
+-#else
+-void C();
+-
+-int main() {
+-  C();
+-  return 0;
+-}
+-#endif
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/dso_handle.cpp
+===================================================================
+--- /dev/null
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/dso_handle.cpp
+@@ -0,0 +1,35 @@
++// RUN: %clangxx -g -DCRT_SHARED -c %s -fPIC -o %tshared.o
++// RUN: %clangxx -g -c %s -fPIC -o %t.o
++// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %crtbegin %tshared.o %libstdcxx -lc -lm %libgcc %crtend %crtn
++// RUN: %clangxx -g -o %t -fno-pic -no-pie -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn
++// RUN: %run %t 2>&1 | FileCheck %s
++
++// UNSUPPORTED: target={{(arm|aarch64).*}}
++
++#include <stdio.h>
++
++// CHECK: 1
++// CHECK-NEXT: ~A()
++
++#ifdef CRT_SHARED
++bool G;
++void C() {
++  printf("%d\n", G);
++}
++
++struct A {
++  A() { G = true; }
++  ~A() {
++    printf("~A()\n");
++  }
++};
++
++A a;
++#else
++void C();
++
++int main() {
++  C();
++  return 0;
++}
++#endif
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/lit.cfg.py
+===================================================================
+--- /dev/null
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/lit.cfg.py
+@@ -0,0 +1,95 @@
++# -*- Python -*-
++
++import os
++import subprocess
++import shlex
++
++# Setup config name.
++config.name = "CRT" + config.name_suffix
++
++# Setup source root.
++config.test_source_root = os.path.dirname(__file__)
++
++
++# Choose between lit's internal shell pipeline runner and a real shell.  If
++# LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override.
++use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
++if use_lit_shell:
++    # 0 is external, "" is default, and everything else is internal.
++    execute_external = use_lit_shell == "0"
++else:
++    # Otherwise we default to internal on Windows and external elsewhere, as
++    # bash on Windows is usually very slow.
++    execute_external = not sys.platform in ["win32"]
++
++
++def get_library_path(file):
++    cmd = subprocess.Popen(
++        [config.clang.strip(), "-print-file-name=%s" % file]
++        + shlex.split(config.target_cflags),
++        stdout=subprocess.PIPE,
++        env=config.environment,
++        universal_newlines=True,
++    )
++    if not cmd.stdout:
++        lit_config.fatal("Couldn't find the library path for '%s'" % file)
++    dir = cmd.stdout.read().strip()
++    if sys.platform in ["win32"] and execute_external:
++        # Don't pass dosish path separator to msys bash.exe.
++        dir = dir.replace("\\", "/")
++    return dir
++
++
++def get_libgcc_file_name():
++    cmd = subprocess.Popen(
++        [config.clang.strip(), "-print-libgcc-file-name"]
++        + shlex.split(config.target_cflags),
++        stdout=subprocess.PIPE,
++        env=config.environment,
++        universal_newlines=True,
++    )
++    if not cmd.stdout:
++        lit_config.fatal("Couldn't find the library path for '%s'" % file)
++    dir = cmd.stdout.read().strip()
++    if sys.platform in ["win32"] and execute_external:
++        # Don't pass dosish path separator to msys bash.exe.
++        dir = dir.replace("\\", "/")
++    return dir
++
++
++def build_invocation(compile_flags):
++    return " " + " ".join([config.clang] + compile_flags) + " "
++
++
++# Setup substitutions.
++config.substitutions.append(("%clang ", build_invocation([config.target_cflags])))
++config.substitutions.append(
++    ("%clangxx ", build_invocation(config.cxx_mode_flags + [config.target_cflags]))
++)
++
++base_lib = os.path.join(
++    config.compiler_rt_libdir, "clang_rt.%%s%s.o" % config.target_suffix
++)
++
++if sys.platform in ["win32"] and execute_external:
++    # Don't pass dosish path separator to msys bash.exe.
++    base_lib = base_lib.replace("\\", "/")
++
++config.substitutions.append(("%crtbegin", base_lib % "crtbegin"))
++config.substitutions.append(("%crtend", base_lib % "crtend"))
++
++config.substitutions.append(("%crt1", get_library_path("crt1.o")))
++config.substitutions.append(("%crti", get_library_path("crti.o")))
++config.substitutions.append(("%crtn", get_library_path("crtn.o")))
++
++config.substitutions.append(("%libgcc", get_libgcc_file_name()))
++
++config.substitutions.append(
++    ("%libstdcxx", "-l" + config.sanitizer_cxx_lib.lstrip("lib"))
++)
++
++# Default test suffixes.
++config.suffixes = [".c", ".cpp"]
++
++if config.host_os not in ["Linux"]:
++    config.unsupported = True
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/lit.site.cfg.py.in
+===================================================================
+--- /dev/null
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/lit.site.cfg.py.in
+@@ -0,0 +1,14 @@
++@LIT_SITE_CFG_IN_HEADER@
++
++# Tool-specific config options.
++config.name_suffix = "@CRT_TEST_CONFIG_SUFFIX@"
++config.crt_lit_source_dir = "@CRT_LIT_SOURCE_DIR@"
++config.target_cflags = "@CRT_TEST_TARGET_CFLAGS@"
++config.target_arch = "@CRT_TEST_TARGET_ARCH@"
++config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@"
++
++# Load common config for all compiler-rt lit tests
++lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
++
++# Load tool-specific config that would do the real work.
++lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg.py")
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/builtins/crtbegin.c
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/lib/builtins/crtbegin.c
++++ /dev/null
+@@ -1,135 +0,0 @@
+-//===-- crtbegin.c - Start of constructors and destructors ----------------===//
+-//
+-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+-// See https://llvm.org/LICENSE.txt for license information.
+-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+-//
+-//===----------------------------------------------------------------------===//
+-
+-#include <stddef.h>
+-
+-__attribute__((visibility("hidden"))) void *__dso_handle = &__dso_handle;
+-
+-#ifdef EH_USE_FRAME_REGISTRY
+-__extension__ static void *__EH_FRAME_LIST__[]
+-    __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {};
+-
+-extern void __register_frame_info(const void *, void *) __attribute__((weak));
+-extern void *__deregister_frame_info(const void *) __attribute__((weak));
+-#endif
+-
+-#ifndef CRT_HAS_INITFINI_ARRAY
+-typedef void (*fp)(void);
+-
+-static fp __CTOR_LIST__[]
+-    __attribute__((section(".ctors"), aligned(sizeof(fp)))) = {(fp)-1};
+-extern fp __CTOR_LIST_END__[];
+-#endif
+-
+-extern void __cxa_finalize(void *) __attribute__((weak));
+-
+-static void __attribute__((used)) __do_init(void) {
+-  static _Bool __initialized;
+-  if (__builtin_expect(__initialized, 0))
+-    return;
+-  __initialized = 1;
+-
+-#ifdef EH_USE_FRAME_REGISTRY
+-  static struct { void *p[8]; } __object;
+-  if (__register_frame_info)
+-    __register_frame_info(__EH_FRAME_LIST__, &__object);
+-#endif
+-#ifndef CRT_HAS_INITFINI_ARRAY
+-  const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1;
+-  for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i]();
+-#endif
+-}
+-
+-#ifdef CRT_HAS_INITFINI_ARRAY
+-__attribute__((section(".init_array"),
+-               used)) static void (*__init)(void) = __do_init;
+-#elif defined(__i386__) || defined(__x86_64__)
+-__asm__(".pushsection .init,\"ax\",@progbits\n\t"
+-        "call __do_init\n\t"
+-        ".popsection");
+-#elif defined(__riscv)
+-__asm__(".pushsection .init,\"ax\",%progbits\n\t"
+-        "call __do_init\n\t"
+-        ".popsection");
+-#elif defined(__arm__) || defined(__aarch64__)
+-__asm__(".pushsection .init,\"ax\",%progbits\n\t"
+-        "bl __do_init\n\t"
+-        ".popsection");
+-#elif defined(__mips__)
+-__asm__(".pushsection .init,\"ax\",@progbits\n\t"
+-        "jal __do_init\n\t"
+-        ".popsection");
+-#elif defined(__powerpc__) || defined(__powerpc64__)
+-__asm__(".pushsection .init,\"ax\",@progbits\n\t"
+-        "bl __do_init\n\t"
+-        "nop\n\t"
+-        ".popsection");
+-#elif defined(__sparc__)
+-__asm__(".pushsection .init,\"ax\",@progbits\n\t"
+-        "call __do_init\n\t"
+-        ".popsection");
+-#else
+-#error "crtbegin without .init_fini array unimplemented for this architecture"
+-#endif // CRT_HAS_INITFINI_ARRAY
+-
+-#ifndef CRT_HAS_INITFINI_ARRAY
+-static fp __DTOR_LIST__[]
+-    __attribute__((section(".dtors"), aligned(sizeof(fp)))) = {(fp)-1};
+-extern fp __DTOR_LIST_END__[];
+-#endif
+-
+-static void __attribute__((used)) __do_fini(void) {
+-  static _Bool __finalized;
+-  if (__builtin_expect(__finalized, 0))
+-    return;
+-  __finalized = 1;
+-
+-  if (__cxa_finalize)
+-    __cxa_finalize(__dso_handle);
+-
+-#ifndef CRT_HAS_INITFINI_ARRAY
+-  const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1;
+-  for (size_t i = 1; i <= n; i++) __DTOR_LIST__[i]();
+-#endif
+-#ifdef EH_USE_FRAME_REGISTRY
+-  if (__deregister_frame_info)
+-    __deregister_frame_info(__EH_FRAME_LIST__);
+-#endif
+-}
+-
+-#ifdef CRT_HAS_INITFINI_ARRAY
+-__attribute__((section(".fini_array"),
+-               used)) static void (*__fini)(void) = __do_fini;
+-#elif defined(__i386__) || defined(__x86_64__)
+-__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
+-        "call __do_fini\n\t"
+-        ".popsection");
+-#elif defined(__arm__) || defined(__aarch64__)
+-__asm__(".pushsection .fini,\"ax\",%progbits\n\t"
+-        "bl __do_fini\n\t"
+-        ".popsection");
+-#elif defined(__mips__)
+-__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
+-        "jal __do_fini\n\t"
+-        ".popsection");
+-#elif defined(__powerpc__) || defined(__powerpc64__)
+-__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
+-        "bl __do_fini\n\t"
+-        "nop\n\t"
+-        ".popsection");
+-#elif defined(__riscv)
+-__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
+-        "call __do_fini\n\t"
+-        ".popsection");
+-#elif defined(__sparc__)
+-__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
+-        "call __do_fini\n\t"
+-        ".popsection");
+-#else
+-#error "crtbegin without .init_fini array unimplemented for this architecture"
+-#endif  // CRT_HAS_INIT_FINI_ARRAY
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/builtins/crtend.c
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/lib/builtins/crtend.c
++++ /dev/null
+@@ -1,22 +0,0 @@
+-//===-- crtend.c - End of constructors and destructors --------------------===//
+-//
+-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+-// See https://llvm.org/LICENSE.txt for license information.
+-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+-//
+-//===----------------------------------------------------------------------===//
+-
+-#include <stdint.h>
+-
+-// Put 4-byte zero which is the length field in FDE at the end as a terminator.
+-const int32_t __EH_FRAME_LIST_END__[]
+-    __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)),
+-                   visibility("hidden"), used)) = {0};
+-
+-#ifndef CRT_HAS_INITFINI_ARRAY
+-typedef void (*fp)(void);
+-fp __CTOR_LIST_END__[]
+-    __attribute__((section(".ctors"), visibility("hidden"), used)) = {0};
+-fp __DTOR_LIST_END__[]
+-    __attribute__((section(".dtors"), visibility("hidden"), used)) = {0};
+-#endif
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/crtbegin.c
+===================================================================
+--- /dev/null
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/crtbegin.c
+@@ -0,0 +1,135 @@
++//===-- crtbegin.c - Start of constructors and destructors ----------------===//
++//
++// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
++// See https://llvm.org/LICENSE.txt for license information.
++// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
++//
++//===----------------------------------------------------------------------===//
++
++#include <stddef.h>
++
++__attribute__((visibility("hidden"))) void *__dso_handle = &__dso_handle;
++
++#ifdef EH_USE_FRAME_REGISTRY
++__extension__ static void *__EH_FRAME_LIST__[]
++    __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {};
++
++extern void __register_frame_info(const void *, void *) __attribute__((weak));
++extern void *__deregister_frame_info(const void *) __attribute__((weak));
++#endif
++
++#ifndef CRT_HAS_INITFINI_ARRAY
++typedef void (*fp)(void);
++
++static fp __CTOR_LIST__[]
++    __attribute__((section(".ctors"), aligned(sizeof(fp)))) = {(fp)-1};
++extern fp __CTOR_LIST_END__[];
++#endif
++
++extern void __cxa_finalize(void *) __attribute__((weak));
++
++static void __attribute__((used)) __do_init(void) {
++  static _Bool __initialized;
++  if (__builtin_expect(__initialized, 0))
++    return;
++  __initialized = 1;
++
++#ifdef EH_USE_FRAME_REGISTRY
++  static struct { void *p[8]; } __object;
++  if (__register_frame_info)
++    __register_frame_info(__EH_FRAME_LIST__, &__object);
++#endif
++#ifndef CRT_HAS_INITFINI_ARRAY
++  const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1;
++  for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i]();
++#endif
++}
++
++#ifdef CRT_HAS_INITFINI_ARRAY
++__attribute__((section(".init_array"),
++               used)) static void (*__init)(void) = __do_init;
++#elif defined(__i386__) || defined(__x86_64__)
++__asm__(".pushsection .init,\"ax\",@progbits\n\t"
++        "call __do_init\n\t"
++        ".popsection");
++#elif defined(__riscv)
++__asm__(".pushsection .init,\"ax\",%progbits\n\t"
++        "call __do_init\n\t"
++        ".popsection");
++#elif defined(__arm__) || defined(__aarch64__)
++__asm__(".pushsection .init,\"ax\",%progbits\n\t"
++        "bl __do_init\n\t"
++        ".popsection");
++#elif defined(__mips__)
++__asm__(".pushsection .init,\"ax\",@progbits\n\t"
++        "jal __do_init\n\t"
++        ".popsection");
++#elif defined(__powerpc__) || defined(__powerpc64__)
++__asm__(".pushsection .init,\"ax\",@progbits\n\t"
++        "bl __do_init\n\t"
++        "nop\n\t"
++        ".popsection");
++#elif defined(__sparc__)
++__asm__(".pushsection .init,\"ax\",@progbits\n\t"
++        "call __do_init\n\t"
++        ".popsection");
++#else
++#error "crtbegin without .init_fini array unimplemented for this architecture"
++#endif // CRT_HAS_INITFINI_ARRAY
++
++#ifndef CRT_HAS_INITFINI_ARRAY
++static fp __DTOR_LIST__[]
++    __attribute__((section(".dtors"), aligned(sizeof(fp)))) = {(fp)-1};
++extern fp __DTOR_LIST_END__[];
++#endif
++
++static void __attribute__((used)) __do_fini(void) {
++  static _Bool __finalized;
++  if (__builtin_expect(__finalized, 0))
++    return;
++  __finalized = 1;
++
++  if (__cxa_finalize)
++    __cxa_finalize(__dso_handle);
++
++#ifndef CRT_HAS_INITFINI_ARRAY
++  const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1;
++  for (size_t i = 1; i <= n; i++) __DTOR_LIST__[i]();
++#endif
++#ifdef EH_USE_FRAME_REGISTRY
++  if (__deregister_frame_info)
++    __deregister_frame_info(__EH_FRAME_LIST__);
++#endif
++}
++
++#ifdef CRT_HAS_INITFINI_ARRAY
++__attribute__((section(".fini_array"),
++               used)) static void (*__fini)(void) = __do_fini;
++#elif defined(__i386__) || defined(__x86_64__)
++__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
++        "call __do_fini\n\t"
++        ".popsection");
++#elif defined(__arm__) || defined(__aarch64__)
++__asm__(".pushsection .fini,\"ax\",%progbits\n\t"
++        "bl __do_fini\n\t"
++        ".popsection");
++#elif defined(__mips__)
++__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
++        "jal __do_fini\n\t"
++        ".popsection");
++#elif defined(__powerpc__) || defined(__powerpc64__)
++__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
++        "bl __do_fini\n\t"
++        "nop\n\t"
++        ".popsection");
++#elif defined(__riscv)
++__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
++        "call __do_fini\n\t"
++        ".popsection");
++#elif defined(__sparc__)
++__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
++        "call __do_fini\n\t"
++        ".popsection");
++#else
++#error "crtbegin without .init_fini array unimplemented for this architecture"
++#endif  // CRT_HAS_INIT_FINI_ARRAY
+Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/crtend.c
+===================================================================
+--- /dev/null
++++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/crtend.c
+@@ -0,0 +1,22 @@
++//===-- crtend.c - End of constructors and destructors --------------------===//
++//
++// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
++// See https://llvm.org/LICENSE.txt for license information.
++// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
++//
++//===----------------------------------------------------------------------===//
++
++#include <stdint.h>
++
++// Put 4-byte zero which is the length field in FDE at the end as a terminator.
++const int32_t __EH_FRAME_LIST_END__[]
++    __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)),
++                   visibility("hidden"), used)) = {0};
++
++#ifndef CRT_HAS_INITFINI_ARRAY
++typedef void (*fp)(void);
++fp __CTOR_LIST_END__[]
++    __attribute__((section(".ctors"), visibility("hidden"), used)) = {0};
++fp __DTOR_LIST_END__[]
++    __attribute__((section(".dtors"), visibility("hidden"), used)) = {0};
++#endif
diff --git a/debian/patches/series b/debian/patches/series
index f2744617..dde91e21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,3 +148,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
+revert-move-issue-63799.diff

From 08b30b137635eb268021d49abad8de2d9cbc7268 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 11 Jul 2023 18:11:26 +0200
Subject: [PATCH 109/349] Revert "revert patch to fix 63799"

This reverts commit d26f9b9dc085860551ce476fc30d83b11b1016c7.
---
 debian/patches/revert-move-issue-63799.diff | 1053 -------------------
 debian/patches/series                       |    1 -
 2 files changed, 1054 deletions(-)
 delete mode 100644 debian/patches/revert-move-issue-63799.diff

diff --git a/debian/patches/revert-move-issue-63799.diff b/debian/patches/revert-move-issue-63799.diff
deleted file mode 100644
index e956f58d..00000000
--- a/debian/patches/revert-move-issue-63799.diff
+++ /dev/null
@@ -1,1053 +0,0 @@
-commit dae9d1b52469daca88a968e7b99a26420aef657c
-Author: Petr Hosek <phosek@google.com>
-Date:   Wed Jun 28 07:14:00 2023 +0000
-
-    [compiler-rt] Move crt into builtins
-    
-    On Linux crt is typically use in combination with builtins. In the Clang
-    driver the use of builtins and crt is controlled by the --rtlib option.
-    Both builtins and crt also have similar build requirements where they
-    need to be built before any other runtimes and must avoid dependencies.
-    We also want builtins and crt these to be buildable separately from the
-    rest of compiler-rt for bootstrapping purposes. Given how simple crt is,
-    rather than maintaining a separate directory with its own separate build
-    setup, it's more efficient to just move crt into builtins. We still use
-    separate CMake option to control whether to built crt same as before.
-    
-    This is an alternative to D89492 and D136664.
-    
-    Differential Revision: https://reviews.llvm.org/D153989
-
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/CMakeLists.txt
-@@ -39,6 +39,10 @@ option(COMPILER_RT_BUILD_BUILTINS "Build
- mark_as_advanced(COMPILER_RT_BUILD_BUILTINS)
- option(COMPILER_RT_DISABLE_AARCH64_FMV "Disable AArch64 Function Multi Versioning support" OFF)
- mark_as_advanced(COMPILER_RT_DISABLE_AARCH64_FMV)
-+option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON)
-+mark_as_advanced(COMPILER_RT_BUILD_CRT)
-+option(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY "Use eh_frame in crtbegin.o/crtend.o" ON)
-+mark_as_advanced(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY)
- option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
- mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS)
- option(COMPILER_RT_BUILD_XRAY "Build xray" ON)
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/cmake/builtin-config-ix.cmake
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/cmake/builtin-config-ix.cmake
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/cmake/builtin-config-ix.cmake
-@@ -13,11 +13,6 @@ builtin_check_c_compiler_flag(-fvisibili
- builtin_check_c_compiler_flag(-fomit-frame-pointer  COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG)
- builtin_check_c_compiler_flag(-ffreestanding        COMPILER_RT_HAS_FFREESTANDING_FLAG)
- builtin_check_c_compiler_flag(-fxray-instrument     COMPILER_RT_HAS_XRAY_COMPILER_FLAG)
--builtin_check_c_compiler_flag(-fno-lto              COMPILER_RT_HAS_FNO_LTO_FLAG)
--builtin_check_c_compiler_flag(-fno-profile-generate COMPILER_RT_HAS_FNO_PROFILE_GENERATE_FLAG)
--builtin_check_c_compiler_flag(-fno-profile-instr-generate COMPILER_RT_HAS_FNO_PROFILE_INSTR_GENERATE_FLAG)
--builtin_check_c_compiler_flag(-fno-profile-instr-use COMPILER_RT_HAS_FNO_PROFILE_INSTR_USE_FLAG)
--builtin_check_c_compiler_flag(-Wno-pedantic         COMPILER_RT_HAS_WNO_PEDANTIC)
- 
- builtin_check_c_compiler_source(COMPILER_RT_HAS_ATOMIC_KEYWORD
- "
-@@ -33,12 +28,6 @@ asm(\".arch armv8-a+lse\");
- asm(\"cas w0, w1, [x2]\");
- ")
- 
--if(ANDROID)
--  set(OS_NAME "Android")
--else()
--  set(OS_NAME "${CMAKE_SYSTEM_NAME}")
--endif()
--
- set(ARM64 aarch64)
- set(ARM32 arm armhf armv4t armv5te armv6 armv6m armv7m armv7em armv7 armv7s armv7k armv8m.base armv8m.main armv8.1m.main)
- set(AVR avr)
-@@ -225,10 +214,4 @@ else()
-     ${ALL_BUILTIN_SUPPORTED_ARCH})
- endif()
- 
--if (OS_NAME MATCHES "Linux" AND NOT LLVM_USE_SANITIZER)
--  set(COMPILER_RT_HAS_CRT TRUE)
--else()
--  set(COMPILER_RT_HAS_CRT FALSE)
--endif()
--
- message(STATUS "Builtin supported architectures: ${BUILTIN_SUPPORTED_ARCH}")
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/lib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/CMakeLists.txt
-@@ -17,6 +17,10 @@ if(COMPILER_RT_BUILD_BUILTINS)
-   add_subdirectory(builtins)
- endif()
- 
-+if(COMPILER_RT_BUILD_CRT)
-+  add_subdirectory(crt)
-+endif()
-+
- function(compiler_rt_build_runtime runtime)
-   string(TOUPPER ${runtime} runtime_uppercase)
-   if(COMPILER_RT_HAS_${runtime_uppercase})
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/builtins/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/lib/builtins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -56,9 +56,12 @@ if (COMPILER_RT_STANDALONE_BUILD)
- endif()
- 
- include(builtin-config-ix)
--include(CMakeDependentOption)
- include(CMakePushCheckState)
- 
-+if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
-+  include(CompilerRTAIXUtils)
-+endif()
-+
- option(COMPILER_RT_BUILTINS_HIDE_SYMBOLS
-   "Do not export any symbols from the static library." ON)
- 
-@@ -692,7 +695,7 @@ set(powerpc64_SOURCES
-   ${GENERIC_SOURCES}
- )
- # These routines require __int128, which isn't supported on AIX.
--if (NOT OS_NAME MATCHES "AIX")
-+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
-   set(powerpc64_SOURCES
-     ppc/floattitf.c
-     ppc/fixtfti.c
-@@ -863,8 +866,6 @@ else ()
-   endforeach ()
- endif ()
- 
--add_dependencies(compiler-rt builtins)
--
- option(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC
-   "Build standalone shared atomic library."
-   OFF)
-@@ -872,8 +873,7 @@ option(COMPILER_RT_BUILD_STANDALONE_LIBA
- if(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC)
-   add_custom_target(builtins-standalone-atomic)
-   set(BUILTIN_TYPE SHARED)
--  if(OS_NAME MATCHES "AIX")
--    include(CompilerRTAIXUtils)
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
-     if(NOT COMPILER_RT_LIBATOMIC_LINK_FLAGS)
-       get_aix_libatomic_default_link_flags(COMPILER_RT_LIBATOMIC_LINK_FLAGS
-         "${CMAKE_CURRENT_SOURCE_DIR}/ppc/atomic.exp")
-@@ -898,7 +898,7 @@ if(COMPILER_RT_BUILD_STANDALONE_LIBATOMI
-   # FIXME: On AIX, we have to archive built shared libraries into a static
-   # archive, i.e., libatomic.a. Once cmake adds support of such usage for AIX,
-   # this ad-hoc part can be removed.
--  if(OS_NAME MATCHES "AIX")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
-     archive_aix_libatomic(clang_rt.atomic libatomic
-                           ARCHS ${BUILTIN_SUPPORTED_ARCH}
-                           PARENT_TARGET builtins-standalone-atomic)
-@@ -906,40 +906,4 @@ if(COMPILER_RT_BUILD_STANDALONE_LIBATOMI
-   add_dependencies(compiler-rt builtins-standalone-atomic)
- endif()
- 
--cmake_dependent_option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON "COMPILER_RT_HAS_CRT" OFF)
--
--if(COMPILER_RT_BUILD_CRT)
--  add_compiler_rt_component(crt)
--
--  option(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY "Use eh_frame in crtbegin.o/crtend.o" ON)
--
--  include(CheckSectionExists)
--  check_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
--    SOURCE "volatile int x;\n__attribute__((constructor)) void f(void) {x = 0;}\nint main(void) { return 0; }\n")
--
--  append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 CRT_CFLAGS)
--  append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
--  append_list_if(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY -DEH_USE_FRAME_REGISTRY CRT_CFLAGS)
--  append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS)
--  append_list_if(COMPILER_RT_HAS_WNO_PEDANTIC -Wno-pedantic CRT_CFLAGS)
--  if (COMPILER_RT_HAS_FCF_PROTECTION_FLAG)
--    append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full CRT_CFLAGS)
--  endif()
--
--  foreach(arch ${BUILTIN_SUPPORTED_ARCH})
--    add_compiler_rt_runtime(clang_rt.crtbegin
--      OBJECT
--      ARCHS ${arch}
--      SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c
--      CFLAGS ${CRT_CFLAGS}
--      PARENT_TARGET crt)
--    add_compiler_rt_runtime(clang_rt.crtend
--      OBJECT
--      ARCHS ${arch}
--      SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c
--      CFLAGS ${CRT_CFLAGS}
--      PARENT_TARGET crt)
--  endforeach()
--
--  add_dependencies(compiler-rt crt)
--endif()
-+add_dependencies(compiler-rt builtins)
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/CMakeLists.txt
-@@ -0,0 +1,63 @@
-+if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-+  cmake_minimum_required(VERSION 3.20.0)
-+
-+  set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-+  project(CompilerRTCRT C)
-+  set(COMPILER_RT_STANDALONE_BUILD TRUE)
-+  set(COMPILER_RT_CRT_STANDALONE_BUILD TRUE)
-+
-+  set(COMPILER_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
-+
-+  set(LLVM_COMMON_CMAKE_UTILS "${COMPILER_RT_SOURCE_DIR}/../cmake")
-+
-+  # Add path for custom modules
-+  list(INSERT CMAKE_MODULE_PATH 0
-+    "${COMPILER_RT_SOURCE_DIR}/cmake"
-+    "${COMPILER_RT_SOURCE_DIR}/cmake/Modules"
-+    "${LLVM_COMMON_CMAKE_UTILS}"
-+    "${LLVM_COMMON_CMAKE_UTILS}/Modules"
-+    )
-+
-+  include(base-config-ix)
-+  include(CompilerRTUtils)
-+
-+  load_llvm_config()
-+  construct_compiler_rt_default_triple()
-+
-+  include(SetPlatformToolchainTools)
-+  include(AddCompilerRT)
-+endif()
-+
-+include(crt-config-ix)
-+
-+if(COMPILER_RT_HAS_CRT)
-+  add_compiler_rt_component(crt)
-+
-+  include(CheckSectionExists)
-+  check_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
-+    SOURCE "volatile int x;\n__attribute__((constructor)) void f(void) {x = 0;}\nint main(void) { return 0; }\n")
-+
-+  append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 CRT_CFLAGS)
-+  append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
-+  append_list_if(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY -DEH_USE_FRAME_REGISTRY CRT_CFLAGS)
-+  append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS)
-+  append_list_if(COMPILER_RT_HAS_WNO_PEDANTIC -Wno-pedantic CRT_CFLAGS)
-+  if (COMPILER_RT_HAS_FCF_PROTECTION_FLAG)
-+    append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full CRT_CFLAGS)
-+  endif()
-+
-+  foreach(arch ${CRT_SUPPORTED_ARCH})
-+    add_compiler_rt_runtime(clang_rt.crtbegin
-+      OBJECT
-+      ARCHS ${arch}
-+      SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c
-+      CFLAGS ${CRT_CFLAGS}
-+      PARENT_TARGET crt)
-+    add_compiler_rt_runtime(clang_rt.crtend
-+      OBJECT
-+      ARCHS ${arch}
-+      SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c
-+      CFLAGS ${CRT_CFLAGS}
-+      PARENT_TARGET crt)
-+  endforeach()
-+endif()
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/CMakeLists.txt
-@@ -103,6 +103,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
-   if(COMPILER_RT_BUILD_ORC)
-     compiler_rt_Test_runtime(orc)
-   endif()
-+  if(COMPILER_RT_BUILD_CRT)
-+    add_subdirectory(crt)
-+  endif()
-   # ShadowCallStack does not yet provide a runtime with compiler-rt, the tests
-   # include their own minimal runtime
-   add_subdirectory(shadowcallstack)
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/CMakeLists.txt
-@@ -13,10 +13,6 @@ configure_lit_site_cfg(
- 
- include(builtin-config-ix)
- 
--if (COMPILER_RT_HAS_CRT)
--  list(APPEND BUILTINS_TEST_DEPS crt)
--endif()
--
- # Indicate if this is an MSVC environment.
- pythonize_bool(MSVC)
- 
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/lit.cfg.py
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/Unit/lit.cfg.py
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/lit.cfg.py
-@@ -2,8 +2,6 @@
- 
- import os
- import platform
--import shlex
--import subprocess
- 
- import lit.formats
- 
-@@ -30,40 +28,6 @@ def get_required_attr(config, attr_name)
-     return attr_value
- 
- 
--def get_library_path(file):
--    cmd = subprocess.Popen(
--        [config.clang.strip(), "-print-file-name=%s" % file]
--        + shlex.split(config.target_cflags),
--        stdout=subprocess.PIPE,
--        env=config.environment,
--        universal_newlines=True,
--    )
--    if not cmd.stdout:
--        lit_config.fatal("Couldn't find the library path for '%s'" % file)
--    dir = cmd.stdout.read().strip()
--    if sys.platform in ["win32"] and execute_external:
--        # Don't pass dosish path separator to msys bash.exe.
--        dir = dir.replace("\\", "/")
--    return dir
--
--
--def get_libgcc_file_name():
--    cmd = subprocess.Popen(
--        [config.clang.strip(), "-print-libgcc-file-name"]
--        + shlex.split(config.target_cflags),
--        stdout=subprocess.PIPE,
--        env=config.environment,
--        universal_newlines=True,
--    )
--    if not cmd.stdout:
--        lit_config.fatal("Couldn't find the library path for '%s'" % file)
--    dir = cmd.stdout.read().strip()
--    if sys.platform in ["win32"] and execute_external:
--        # Don't pass dosish path separator to msys bash.exe.
--        dir = dir.replace("\\", "/")
--    return dir
--
--
- # Setup config name.
- config.name = "Builtins" + config.name_suffix
- 
-@@ -106,27 +70,6 @@ else:
-         base_lib = base_lib.replace("\\", "/")
-     config.substitutions.append(("%librt ", base_lib + " -lc -lm "))
- 
--    if config.host_os == "Linux":
--        base_obj = os.path.join(
--            config.compiler_rt_libdir, "clang_rt.%%s%s.o" % config.target_suffix
--        )
--        if sys.platform in ["win32"] and execute_external:
--            # Don't pass dosish path separator to msys bash.exe.
--            base_obj = base_obj.replace("\\", "/")
--
--        config.substitutions.append(("%crtbegin", base_obj % "crtbegin"))
--        config.substitutions.append(("%crtend", base_obj % "crtend"))
--
--        config.substitutions.append(("%crt1", get_library_path("crt1.o")))
--        config.substitutions.append(("%crti", get_library_path("crti.o")))
--        config.substitutions.append(("%crtn", get_library_path("crtn.o")))
--
--        config.substitutions.append(("%libgcc", get_libgcc_file_name()))
--
--        config.substitutions.append(
--            ("%libstdcxx", "-l" + config.sanitizer_cxx_lib.lstrip("lib"))
--        )
--
- builtins_source_dir = os.path.join(
-     get_required_attr(config, "compiler_rt_src_root"), "lib", "builtins"
- )
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in
-@@ -4,7 +4,6 @@ config.name_suffix = "@BUILTINS_TEST_CON
- config.builtins_lit_source_dir = "@BUILTINS_LIT_SOURCE_DIR@/Unit"
- config.target_cflags = "@BUILTINS_TEST_TARGET_CFLAGS@"
- config.target_arch = "@BUILTINS_TEST_TARGET_ARCH@"
--config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@"
- config.is_msvc = @MSVC_PYBOOL@
- config.builtins_is_msvc = @BUILTINS_IS_MSVC_PYBOOL@
- config.builtins_lit_source_features = "@BUILTINS_LIT_SOURCE_FEATURES@"
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/CMakeLists.txt
-@@ -0,0 +1,41 @@
-+include(crt-config-ix)
-+
-+if (COMPILER_RT_HAS_CRT)
-+  set(CRT_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-+
-+  if(NOT COMPILER_RT_STANDALONE_BUILD)
-+    list(APPEND CRT_TEST_DEPS crt)
-+  endif()
-+  if(NOT COMPILER_RT_STANDALONE_BUILD AND NOT LLVM_RUNTIMES_BUILD)
-+    # Use LLVM utils and Clang from the same build tree.
-+    list(APPEND CRT_TEST_DEPS
-+      clang clang-resource-headers FileCheck not llvm-config)
-+  endif()
-+
-+  set(CRT_TEST_ARCH ${CRT_SUPPORTED_ARCH})
-+  foreach(arch ${CRT_TEST_ARCH})
-+    set(CRT_TEST_TARGET_ARCH ${arch})
-+    string(TOLOWER "-${arch}-${OS_NAME}" CRT_TEST_CONFIG_SUFFIX)
-+    get_test_cc_for_arch(${arch} CRT_TEST_TARGET_CC CRT_TEST_TARGET_CFLAGS)
-+    string(TOUPPER ${arch} ARCH_UPPER_CASE)
-+    set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)
-+
-+    if (COMPILER_RT_ENABLE_CET)
-+      if (${arch} MATCHES "i386|x86_64")
-+        list(APPEND CRT_TEST_TARGET_CFLAGS -fcf-protection=full)
-+        string(REPLACE ";" " " CRT_TEST_TARGET_CFLAGS "${CRT_TEST_TARGET_CFLAGS}")
-+      else()
-+        message(FATAL_ERROR "The target arch ${arch} doesn't support CET")
-+      endif()
-+    endif()
-+    configure_lit_site_cfg(
-+      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
-+      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py)
-+    list(APPEND CRT_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
-+  endforeach()
-+
-+  add_lit_testsuite(check-crt "Running the CRT tests"
-+    ${CRT_TESTSUITES}
-+    DEPENDS ${CRT_TEST_DEPS})
-+  set_target_properties(check-crt PROPERTIES FOLDER "Compiler-RT Misc")
-+endif()
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/ctor_dtor.c
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/Unit/ctor_dtor.c
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// REQUIRES: linux
--
--// RUN: %clang -fno-use-init-array -g -c %s -o %t.o
--// RUN: %clang -o %t -no-pie -nostdlib %crt1 %crti %crtbegin %t.o -lc %libgcc %crtend %crtn
--// RUN: %run %t 2>&1 | FileCheck %s
--
--#include <stdio.h>
--#include <stdlib.h>
--
--// Ensure the various startup functions are called in the proper order.
--
--// CHECK: __register_frame_info()
--/// ctor() is here if ld.so/libc supports DT_INIT/DT_FINI
--// CHECK:      main()
--/// dtor() is here if ld.so/libc supports DT_INIT/DT_FINI
--// CHECK:      __deregister_frame_info()
--
--struct object;
--static int counter;
--
--void __register_frame_info(const void *fi, struct object *obj) {
--  printf("__register_frame_info()\n");
--}
--
--void __deregister_frame_info(const void *fi) {
--  printf("__deregister_frame_info()\n");
--}
--
--void __attribute__((constructor)) ctor() {
--  printf("ctor()\n");
--  ++counter;
--}
--
--void __attribute__((destructor)) dtor() {
--  printf("dtor()\n");
--  if (--counter != 0)
--    abort();
--}
--
--int main() {
--  printf("main()\n");
--  return 0;
--}
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/ctor_dtor.c
-===================================================================
---- /dev/null
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/ctor_dtor.c
-@@ -0,0 +1,41 @@
-+// RUN: %clang -fno-use-init-array -g -c %s -o %t.o
-+// RUN: %clang -o %t -no-pie -nostdlib %crt1 %crti %crtbegin %t.o -lc %libgcc %crtend %crtn
-+// RUN: %run %t 2>&1 | FileCheck %s
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+// Ensure the various startup functions are called in the proper order.
-+
-+// CHECK: __register_frame_info()
-+/// ctor() is here if ld.so/libc supports DT_INIT/DT_FINI
-+// CHECK:      main()
-+/// dtor() is here if ld.so/libc supports DT_INIT/DT_FINI
-+// CHECK:      __deregister_frame_info()
-+
-+struct object;
-+static int counter;
-+
-+void __register_frame_info(const void *fi, struct object *obj) {
-+  printf("__register_frame_info()\n");
-+}
-+
-+void __deregister_frame_info(const void *fi) {
-+  printf("__deregister_frame_info()\n");
-+}
-+
-+void __attribute__((constructor)) ctor() {
-+  printf("ctor()\n");
-+  ++counter;
-+}
-+
-+void __attribute__((destructor)) dtor() {
-+  printf("dtor()\n");
-+  if (--counter != 0)
-+    abort();
-+}
-+
-+int main() {
-+  printf("main()\n");
-+  return 0;
-+}
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/builtins/Unit/dso_handle.cpp
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/test/builtins/Unit/dso_handle.cpp
-+++ /dev/null
-@@ -1,37 +0,0 @@
--// REQUIRES: linux
--
--// RUN: %clangxx -g -fno-exceptions -DCRT_SHARED -c %s -fPIC -o %tshared.o
--// RUN: %clangxx -g -fno-exceptions -c %s -fPIC -o %t.o
--// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %crtbegin %tshared.o %libstdcxx -lc -lm %libgcc %crtend %crtn
--// RUN: %clangxx -g -o %t -fno-pic -no-pie -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn
--// RUN: %run %t 2>&1 | FileCheck %s
--
--// UNSUPPORTED: target={{(arm|aarch64).*}}
--
--#include <stdio.h>
--
--// CHECK: 1
--// CHECK-NEXT: ~A()
--
--#ifdef CRT_SHARED
--bool G;
--void C() {
--  printf("%d\n", G);
--}
--
--struct A {
--  A() { G = true; }
--  ~A() {
--    printf("~A()\n");
--  }
--};
--
--A a;
--#else
--void C();
--
--int main() {
--  C();
--  return 0;
--}
--#endif
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/dso_handle.cpp
-===================================================================
---- /dev/null
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/dso_handle.cpp
-@@ -0,0 +1,35 @@
-+// RUN: %clangxx -g -DCRT_SHARED -c %s -fPIC -o %tshared.o
-+// RUN: %clangxx -g -c %s -fPIC -o %t.o
-+// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %crtbegin %tshared.o %libstdcxx -lc -lm %libgcc %crtend %crtn
-+// RUN: %clangxx -g -o %t -fno-pic -no-pie -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn
-+// RUN: %run %t 2>&1 | FileCheck %s
-+
-+// UNSUPPORTED: target={{(arm|aarch64).*}}
-+
-+#include <stdio.h>
-+
-+// CHECK: 1
-+// CHECK-NEXT: ~A()
-+
-+#ifdef CRT_SHARED
-+bool G;
-+void C() {
-+  printf("%d\n", G);
-+}
-+
-+struct A {
-+  A() { G = true; }
-+  ~A() {
-+    printf("~A()\n");
-+  }
-+};
-+
-+A a;
-+#else
-+void C();
-+
-+int main() {
-+  C();
-+  return 0;
-+}
-+#endif
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/lit.cfg.py
-===================================================================
---- /dev/null
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/lit.cfg.py
-@@ -0,0 +1,95 @@
-+# -*- Python -*-
-+
-+import os
-+import subprocess
-+import shlex
-+
-+# Setup config name.
-+config.name = "CRT" + config.name_suffix
-+
-+# Setup source root.
-+config.test_source_root = os.path.dirname(__file__)
-+
-+
-+# Choose between lit's internal shell pipeline runner and a real shell.  If
-+# LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override.
-+use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
-+if use_lit_shell:
-+    # 0 is external, "" is default, and everything else is internal.
-+    execute_external = use_lit_shell == "0"
-+else:
-+    # Otherwise we default to internal on Windows and external elsewhere, as
-+    # bash on Windows is usually very slow.
-+    execute_external = not sys.platform in ["win32"]
-+
-+
-+def get_library_path(file):
-+    cmd = subprocess.Popen(
-+        [config.clang.strip(), "-print-file-name=%s" % file]
-+        + shlex.split(config.target_cflags),
-+        stdout=subprocess.PIPE,
-+        env=config.environment,
-+        universal_newlines=True,
-+    )
-+    if not cmd.stdout:
-+        lit_config.fatal("Couldn't find the library path for '%s'" % file)
-+    dir = cmd.stdout.read().strip()
-+    if sys.platform in ["win32"] and execute_external:
-+        # Don't pass dosish path separator to msys bash.exe.
-+        dir = dir.replace("\\", "/")
-+    return dir
-+
-+
-+def get_libgcc_file_name():
-+    cmd = subprocess.Popen(
-+        [config.clang.strip(), "-print-libgcc-file-name"]
-+        + shlex.split(config.target_cflags),
-+        stdout=subprocess.PIPE,
-+        env=config.environment,
-+        universal_newlines=True,
-+    )
-+    if not cmd.stdout:
-+        lit_config.fatal("Couldn't find the library path for '%s'" % file)
-+    dir = cmd.stdout.read().strip()
-+    if sys.platform in ["win32"] and execute_external:
-+        # Don't pass dosish path separator to msys bash.exe.
-+        dir = dir.replace("\\", "/")
-+    return dir
-+
-+
-+def build_invocation(compile_flags):
-+    return " " + " ".join([config.clang] + compile_flags) + " "
-+
-+
-+# Setup substitutions.
-+config.substitutions.append(("%clang ", build_invocation([config.target_cflags])))
-+config.substitutions.append(
-+    ("%clangxx ", build_invocation(config.cxx_mode_flags + [config.target_cflags]))
-+)
-+
-+base_lib = os.path.join(
-+    config.compiler_rt_libdir, "clang_rt.%%s%s.o" % config.target_suffix
-+)
-+
-+if sys.platform in ["win32"] and execute_external:
-+    # Don't pass dosish path separator to msys bash.exe.
-+    base_lib = base_lib.replace("\\", "/")
-+
-+config.substitutions.append(("%crtbegin", base_lib % "crtbegin"))
-+config.substitutions.append(("%crtend", base_lib % "crtend"))
-+
-+config.substitutions.append(("%crt1", get_library_path("crt1.o")))
-+config.substitutions.append(("%crti", get_library_path("crti.o")))
-+config.substitutions.append(("%crtn", get_library_path("crtn.o")))
-+
-+config.substitutions.append(("%libgcc", get_libgcc_file_name()))
-+
-+config.substitutions.append(
-+    ("%libstdcxx", "-l" + config.sanitizer_cxx_lib.lstrip("lib"))
-+)
-+
-+# Default test suffixes.
-+config.suffixes = [".c", ".cpp"]
-+
-+if config.host_os not in ["Linux"]:
-+    config.unsupported = True
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/lit.site.cfg.py.in
-===================================================================
---- /dev/null
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/test/crt/lit.site.cfg.py.in
-@@ -0,0 +1,14 @@
-+@LIT_SITE_CFG_IN_HEADER@
-+
-+# Tool-specific config options.
-+config.name_suffix = "@CRT_TEST_CONFIG_SUFFIX@"
-+config.crt_lit_source_dir = "@CRT_LIT_SOURCE_DIR@"
-+config.target_cflags = "@CRT_TEST_TARGET_CFLAGS@"
-+config.target_arch = "@CRT_TEST_TARGET_ARCH@"
-+config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@"
-+
-+# Load common config for all compiler-rt lit tests
-+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
-+
-+# Load tool-specific config that would do the real work.
-+lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg.py")
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/builtins/crtbegin.c
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/lib/builtins/crtbegin.c
-+++ /dev/null
-@@ -1,135 +0,0 @@
--//===-- crtbegin.c - Start of constructors and destructors ----------------===//
--//
--// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
--// See https://llvm.org/LICENSE.txt for license information.
--// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
--//
--//===----------------------------------------------------------------------===//
--
--#include <stddef.h>
--
--__attribute__((visibility("hidden"))) void *__dso_handle = &__dso_handle;
--
--#ifdef EH_USE_FRAME_REGISTRY
--__extension__ static void *__EH_FRAME_LIST__[]
--    __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {};
--
--extern void __register_frame_info(const void *, void *) __attribute__((weak));
--extern void *__deregister_frame_info(const void *) __attribute__((weak));
--#endif
--
--#ifndef CRT_HAS_INITFINI_ARRAY
--typedef void (*fp)(void);
--
--static fp __CTOR_LIST__[]
--    __attribute__((section(".ctors"), aligned(sizeof(fp)))) = {(fp)-1};
--extern fp __CTOR_LIST_END__[];
--#endif
--
--extern void __cxa_finalize(void *) __attribute__((weak));
--
--static void __attribute__((used)) __do_init(void) {
--  static _Bool __initialized;
--  if (__builtin_expect(__initialized, 0))
--    return;
--  __initialized = 1;
--
--#ifdef EH_USE_FRAME_REGISTRY
--  static struct { void *p[8]; } __object;
--  if (__register_frame_info)
--    __register_frame_info(__EH_FRAME_LIST__, &__object);
--#endif
--#ifndef CRT_HAS_INITFINI_ARRAY
--  const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1;
--  for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i]();
--#endif
--}
--
--#ifdef CRT_HAS_INITFINI_ARRAY
--__attribute__((section(".init_array"),
--               used)) static void (*__init)(void) = __do_init;
--#elif defined(__i386__) || defined(__x86_64__)
--__asm__(".pushsection .init,\"ax\",@progbits\n\t"
--        "call __do_init\n\t"
--        ".popsection");
--#elif defined(__riscv)
--__asm__(".pushsection .init,\"ax\",%progbits\n\t"
--        "call __do_init\n\t"
--        ".popsection");
--#elif defined(__arm__) || defined(__aarch64__)
--__asm__(".pushsection .init,\"ax\",%progbits\n\t"
--        "bl __do_init\n\t"
--        ".popsection");
--#elif defined(__mips__)
--__asm__(".pushsection .init,\"ax\",@progbits\n\t"
--        "jal __do_init\n\t"
--        ".popsection");
--#elif defined(__powerpc__) || defined(__powerpc64__)
--__asm__(".pushsection .init,\"ax\",@progbits\n\t"
--        "bl __do_init\n\t"
--        "nop\n\t"
--        ".popsection");
--#elif defined(__sparc__)
--__asm__(".pushsection .init,\"ax\",@progbits\n\t"
--        "call __do_init\n\t"
--        ".popsection");
--#else
--#error "crtbegin without .init_fini array unimplemented for this architecture"
--#endif // CRT_HAS_INITFINI_ARRAY
--
--#ifndef CRT_HAS_INITFINI_ARRAY
--static fp __DTOR_LIST__[]
--    __attribute__((section(".dtors"), aligned(sizeof(fp)))) = {(fp)-1};
--extern fp __DTOR_LIST_END__[];
--#endif
--
--static void __attribute__((used)) __do_fini(void) {
--  static _Bool __finalized;
--  if (__builtin_expect(__finalized, 0))
--    return;
--  __finalized = 1;
--
--  if (__cxa_finalize)
--    __cxa_finalize(__dso_handle);
--
--#ifndef CRT_HAS_INITFINI_ARRAY
--  const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1;
--  for (size_t i = 1; i <= n; i++) __DTOR_LIST__[i]();
--#endif
--#ifdef EH_USE_FRAME_REGISTRY
--  if (__deregister_frame_info)
--    __deregister_frame_info(__EH_FRAME_LIST__);
--#endif
--}
--
--#ifdef CRT_HAS_INITFINI_ARRAY
--__attribute__((section(".fini_array"),
--               used)) static void (*__fini)(void) = __do_fini;
--#elif defined(__i386__) || defined(__x86_64__)
--__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
--        "call __do_fini\n\t"
--        ".popsection");
--#elif defined(__arm__) || defined(__aarch64__)
--__asm__(".pushsection .fini,\"ax\",%progbits\n\t"
--        "bl __do_fini\n\t"
--        ".popsection");
--#elif defined(__mips__)
--__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
--        "jal __do_fini\n\t"
--        ".popsection");
--#elif defined(__powerpc__) || defined(__powerpc64__)
--__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
--        "bl __do_fini\n\t"
--        "nop\n\t"
--        ".popsection");
--#elif defined(__riscv)
--__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
--        "call __do_fini\n\t"
--        ".popsection");
--#elif defined(__sparc__)
--__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
--        "call __do_fini\n\t"
--        ".popsection");
--#else
--#error "crtbegin without .init_fini array unimplemented for this architecture"
--#endif  // CRT_HAS_INIT_FINI_ARRAY
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/builtins/crtend.c
-===================================================================
---- llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25.orig/compiler-rt/lib/builtins/crtend.c
-+++ /dev/null
-@@ -1,22 +0,0 @@
--//===-- crtend.c - End of constructors and destructors --------------------===//
--//
--// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
--// See https://llvm.org/LICENSE.txt for license information.
--// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
--//
--//===----------------------------------------------------------------------===//
--
--#include <stdint.h>
--
--// Put 4-byte zero which is the length field in FDE at the end as a terminator.
--const int32_t __EH_FRAME_LIST_END__[]
--    __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)),
--                   visibility("hidden"), used)) = {0};
--
--#ifndef CRT_HAS_INITFINI_ARRAY
--typedef void (*fp)(void);
--fp __CTOR_LIST_END__[]
--    __attribute__((section(".ctors"), visibility("hidden"), used)) = {0};
--fp __DTOR_LIST_END__[]
--    __attribute__((section(".dtors"), visibility("hidden"), used)) = {0};
--#endif
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/crtbegin.c
-===================================================================
---- /dev/null
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/crtbegin.c
-@@ -0,0 +1,135 @@
-+//===-- crtbegin.c - Start of constructors and destructors ----------------===//
-+//
-+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-+// See https://llvm.org/LICENSE.txt for license information.
-+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+//
-+//===----------------------------------------------------------------------===//
-+
-+#include <stddef.h>
-+
-+__attribute__((visibility("hidden"))) void *__dso_handle = &__dso_handle;
-+
-+#ifdef EH_USE_FRAME_REGISTRY
-+__extension__ static void *__EH_FRAME_LIST__[]
-+    __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {};
-+
-+extern void __register_frame_info(const void *, void *) __attribute__((weak));
-+extern void *__deregister_frame_info(const void *) __attribute__((weak));
-+#endif
-+
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+typedef void (*fp)(void);
-+
-+static fp __CTOR_LIST__[]
-+    __attribute__((section(".ctors"), aligned(sizeof(fp)))) = {(fp)-1};
-+extern fp __CTOR_LIST_END__[];
-+#endif
-+
-+extern void __cxa_finalize(void *) __attribute__((weak));
-+
-+static void __attribute__((used)) __do_init(void) {
-+  static _Bool __initialized;
-+  if (__builtin_expect(__initialized, 0))
-+    return;
-+  __initialized = 1;
-+
-+#ifdef EH_USE_FRAME_REGISTRY
-+  static struct { void *p[8]; } __object;
-+  if (__register_frame_info)
-+    __register_frame_info(__EH_FRAME_LIST__, &__object);
-+#endif
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+  const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1;
-+  for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i]();
-+#endif
-+}
-+
-+#ifdef CRT_HAS_INITFINI_ARRAY
-+__attribute__((section(".init_array"),
-+               used)) static void (*__init)(void) = __do_init;
-+#elif defined(__i386__) || defined(__x86_64__)
-+__asm__(".pushsection .init,\"ax\",@progbits\n\t"
-+        "call __do_init\n\t"
-+        ".popsection");
-+#elif defined(__riscv)
-+__asm__(".pushsection .init,\"ax\",%progbits\n\t"
-+        "call __do_init\n\t"
-+        ".popsection");
-+#elif defined(__arm__) || defined(__aarch64__)
-+__asm__(".pushsection .init,\"ax\",%progbits\n\t"
-+        "bl __do_init\n\t"
-+        ".popsection");
-+#elif defined(__mips__)
-+__asm__(".pushsection .init,\"ax\",@progbits\n\t"
-+        "jal __do_init\n\t"
-+        ".popsection");
-+#elif defined(__powerpc__) || defined(__powerpc64__)
-+__asm__(".pushsection .init,\"ax\",@progbits\n\t"
-+        "bl __do_init\n\t"
-+        "nop\n\t"
-+        ".popsection");
-+#elif defined(__sparc__)
-+__asm__(".pushsection .init,\"ax\",@progbits\n\t"
-+        "call __do_init\n\t"
-+        ".popsection");
-+#else
-+#error "crtbegin without .init_fini array unimplemented for this architecture"
-+#endif // CRT_HAS_INITFINI_ARRAY
-+
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+static fp __DTOR_LIST__[]
-+    __attribute__((section(".dtors"), aligned(sizeof(fp)))) = {(fp)-1};
-+extern fp __DTOR_LIST_END__[];
-+#endif
-+
-+static void __attribute__((used)) __do_fini(void) {
-+  static _Bool __finalized;
-+  if (__builtin_expect(__finalized, 0))
-+    return;
-+  __finalized = 1;
-+
-+  if (__cxa_finalize)
-+    __cxa_finalize(__dso_handle);
-+
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+  const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1;
-+  for (size_t i = 1; i <= n; i++) __DTOR_LIST__[i]();
-+#endif
-+#ifdef EH_USE_FRAME_REGISTRY
-+  if (__deregister_frame_info)
-+    __deregister_frame_info(__EH_FRAME_LIST__);
-+#endif
-+}
-+
-+#ifdef CRT_HAS_INITFINI_ARRAY
-+__attribute__((section(".fini_array"),
-+               used)) static void (*__fini)(void) = __do_fini;
-+#elif defined(__i386__) || defined(__x86_64__)
-+__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
-+        "call __do_fini\n\t"
-+        ".popsection");
-+#elif defined(__arm__) || defined(__aarch64__)
-+__asm__(".pushsection .fini,\"ax\",%progbits\n\t"
-+        "bl __do_fini\n\t"
-+        ".popsection");
-+#elif defined(__mips__)
-+__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
-+        "jal __do_fini\n\t"
-+        ".popsection");
-+#elif defined(__powerpc__) || defined(__powerpc64__)
-+__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
-+        "bl __do_fini\n\t"
-+        "nop\n\t"
-+        ".popsection");
-+#elif defined(__riscv)
-+__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
-+        "call __do_fini\n\t"
-+        ".popsection");
-+#elif defined(__sparc__)
-+__asm__(".pushsection .fini,\"ax\",@progbits\n\t"
-+        "call __do_fini\n\t"
-+        ".popsection");
-+#else
-+#error "crtbegin without .init_fini array unimplemented for this architecture"
-+#endif  // CRT_HAS_INIT_FINI_ARRAY
-Index: llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/crtend.c
-===================================================================
---- /dev/null
-+++ llvm-toolchain-snapshot_17~++20230711030618+7f3d2cd7ec25/compiler-rt/lib/crt/crtend.c
-@@ -0,0 +1,22 @@
-+//===-- crtend.c - End of constructors and destructors --------------------===//
-+//
-+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-+// See https://llvm.org/LICENSE.txt for license information.
-+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+//
-+//===----------------------------------------------------------------------===//
-+
-+#include <stdint.h>
-+
-+// Put 4-byte zero which is the length field in FDE at the end as a terminator.
-+const int32_t __EH_FRAME_LIST_END__[]
-+    __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)),
-+                   visibility("hidden"), used)) = {0};
-+
-+#ifndef CRT_HAS_INITFINI_ARRAY
-+typedef void (*fp)(void);
-+fp __CTOR_LIST_END__[]
-+    __attribute__((section(".ctors"), visibility("hidden"), used)) = {0};
-+fp __DTOR_LIST_END__[]
-+    __attribute__((section(".dtors"), visibility("hidden"), used)) = {0};
-+#endif
diff --git a/debian/patches/series b/debian/patches/series
index dde91e21..f2744617 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,3 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
-revert-move-issue-63799.diff

From a056f2d6027ab1111ee8e41a04e902d8224d8b2e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 15 Jul 2023 11:09:21 +0200
Subject: [PATCH 110/349] Also install llvm-debuginfod in llvm-X.Y

---
 debian/changelog           | 6 ++++++
 debian/llvm-X.Y.install.in | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cedc6dd3..8fbbae8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp2) experimental; urgency=medium
+
+  * Also install llvm-debuginfod in llvm-X.Y
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 15 Jul 2023 11:09:12 +0200
+
 llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental; urgency=medium
 
   * Install usr/lib/llvm-17/lib/clang/17/include/llvm_libc_wrappers/*.h
diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in
index 8ecef7dd..98cc13e3 100644
--- a/debian/llvm-X.Y.install.in
+++ b/debian/llvm-X.Y.install.in
@@ -78,6 +78,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/verify-uselistorder
 usr/lib/llvm-@LLVM_VERSION@/bin/sanstats
 usr/lib/llvm-@LLVM_VERSION@/bin/dsymutil
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod-find
+usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remark-size-diff
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remarkutil
 usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfo-analyzer
@@ -158,5 +159,6 @@ usr/bin/verify-uselistorder-*
 usr/bin/sanstats-*
 usr/bin/dsymutil-*
 usr/bin/llvm-debuginfod-find-*
+usr/bin/llvm-debuginfod-@LLVM_VERSION@
 usr/bin/llvm-remark-size-diff-*
 usr/bin/llvm-debuginfo-analyzer-@LLVM_VERSION@

From cabcb5a126204fbe34f65b9f28992288c092369b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 18 Jul 2023 09:10:46 +0200
Subject: [PATCH 111/349] rebase of the patch

---
 .../23-strlcpy_strlcat_warning_removed.diff   | 53 +++++++++----------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
index f4e4b681..4e95100f 100644
--- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff
+++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
@@ -7,10 +7,10 @@
  clang/test/Sema/warn-strlcpycat-size.c                    |   55 --------------
  6 files changed, 25 insertions(+), 78 deletions(-)
 
-Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/include/clang/Basic/Builtins.def
+Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/include/clang/Basic/Builtins.def
-+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/include/clang/Basic/Builtins.def
+--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/include/clang/Basic/Builtins.def
++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def
 @@ -645,8 +645,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")
@@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/include/cl
  //   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_17~++20230707052836+1882a4ee69b3/clang/lib/AST/Decl.cpp
+Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/AST/Decl.cpp
-+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/AST/Decl.cpp
-@@ -4276,13 +4276,13 @@ unsigned FunctionDecl::getMemoryFunction
+--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/AST/Decl.cpp
++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp
+@@ -4274,13 +4274,13 @@ unsigned FunctionDecl::getMemoryFunction
    case Builtin::BImemmove:
      return Builtin::BImemmove;
  
@@ -57,10 +57,10 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/AST/De
  
    case Builtin::BI__builtin_memcmp:
    case Builtin::BImemcmp:
-Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/SemaChecking.cpp
+Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/Sema/SemaChecking.cpp
-+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/SemaChecking.cpp
+--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/Sema/SemaChecking.cpp
++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp
 @@ -1265,8 +1265,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
    case Builtin::BI__builtin___memcpy_chk:
    case Builtin::BI__builtin___memmove_chk:
@@ -72,7 +72,7 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/S
    case Builtin::BI__builtin___strncat_chk:
    case Builtin::BI__builtin___strncpy_chk:
    case Builtin::BI__builtin___stpncpy_chk:
-@@ -6382,10 +6382,10 @@ bool Sema::CheckFunctionCall(FunctionDec
+@@ -6744,10 +6744,10 @@ bool Sema::CheckFunctionCall(FunctionDec
    switch (CMId) {
    case 0:
      return false;
@@ -85,10 +85,10 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/S
    case Builtin::BIstrncat:
      CheckStrncatArguments(TheCall, FnInfo);
      break;
-Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
-+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 @@ -717,10 +717,10 @@ void GenericTaintChecker::initTaintRules
  
        {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}},
@@ -102,11 +102,11 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Static
        {{CDF_MaybeBuiltin, {{"snprintf"}}},
         TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})},
        {{CDF_MaybeBuiltin, {{"sprintf"}}},
-Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/builtins.c
+Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/test/Sema/builtins.c
-+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/builtins.c
-@@ -194,12 +194,10 @@ void test18(void) {
+--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/builtins.c
++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c
+@@ -197,12 +197,10 @@ void test18(void) {
    void *ptr;
  
    ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
@@ -119,27 +119,26 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/
  }
  
  void no_ms_builtins(void) {
-@@ -212,7 +210,7 @@ void unavailable(void) {
-   __builtin_operator_new(0); // expected-error {{'__builtin_operator_new' is only available in C++}}
+@@ -216,6 +214,7 @@ void unavailable(void) {
    __builtin_operator_delete(0); // expected-error {{'__builtin_operator_delete' is only available in C++}}
  }
--
+ 
 +/*
+ // rdar://18259539
  size_t strlcpy(char * restrict dst, const char * restrict src, size_t size);
  size_t strlcat(char * restrict dst, const char * restrict src, size_t size);
- 
-@@ -234,6 +232,7 @@ void Test19(void)
+@@ -238,6 +237,7 @@ void Test19(void)
                                                                                     // expected-note {{change size argument to be the size of the destination}} \
  				                                                   // expected-warning {{'strlcat' will always overflow; destination buffer has size 20, but size argument is 40}}
  }
 +*/
  
+ // rdar://11076881
  char * Test20(char *p, const char *in, unsigned n)
- {
-Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/warn-strlcpycat-size.c
+Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/warn-strlcpycat-size.c
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/test/Sema/warn-strlcpycat-size.c
-+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/warn-strlcpycat-size.c
+--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/warn-strlcpycat-size.c
++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/warn-strlcpycat-size.c
 @@ -1,55 +0,0 @@
 -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
 -

From 013ecdf4da0a061cee9c39a2820d0264938c56f2 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 21 Jul 2023 09:33:35 +0200
Subject: [PATCH 112/349] prepare release

---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8fbbae8f..8eadfc2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp2) experimental; urgency=medium
+llvm-toolchain-snapshot (1:17~++20230721092305+2ce662c5d596-1~exp1) experimental; urgency=medium
 
+  * New snapshot release
   * Also install llvm-debuginfod in llvm-X.Y
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 15 Jul 2023 11:09:12 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 21 Jul 2023 09:26:43 +0200
 
 llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental; urgency=medium
 

From d42063974ec59758829010fb5ed04f86559914b5 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 21 Jul 2023 15:39:49 +0200
Subject: [PATCH 113/349] =?UTF-8?q?fix=20the=20coinstall=20issue.=20See=20?=
 =?UTF-8?q?#1041388=C2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/rules | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/rules b/debian/rules
index 6103c375..9b87b120 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1065,6 +1065,11 @@ ifeq (${LIBFUZZER_ENABLE},yes)
 	cp -v $(TARGET_BUILD)/libFuzzer.a $(CURDIR)/debian/libfuzzer-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/
 endif
 
+# Because of hurd, we are more flexible in what we include in libclang-X.Y-rt
+# but we don't want to install wasi files into libclang-rt as they have their own package
+# So, we remove this directory from the package
+	rm -f $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/wasi/
+
 # Create this fake directory to make the install libclang-common-dev happy
 # under the unsupported archs of compiler-rt
 	mkdir -p $(DEB_INST)/usr/lib/clang/$(LLVM_VERSION)/lib

From ec9110269d7295aede62f1f2d78a3eb2b5007afd Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 21 Jul 2023 18:43:19 +0200
Subject: [PATCH 114/349] fix for real

---
 debian/changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8eadfc2b..ade4e2c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 llvm-toolchain-snapshot (1:17~++20230721092305+2ce662c5d596-1~exp1) experimental; urgency=medium
 
-  * New snapshot release
+  * New snapshot release:
+  * Fix the libclang-rt-17-dev: ships
+    /usr/lib[...]/wasi/libclang_rt.builtins-wasm*.a, already in
+    libclang-rt-17-dev-wasm* (closes: #1041388)
   * Also install llvm-debuginfod in llvm-X.Y
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 21 Jul 2023 09:26:43 +0200

From 8ed5361ed7e844e8aec61a4689053e317be03ef9 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 22 Jul 2023 16:20:48 +0000
Subject: [PATCH 115/349] Add missing flag

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 9dc5ac82..6d8596a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1296,7 +1296,7 @@ ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(shell dh_listpackages)))
 # Because of hurd, we are more flexible in what we include in libclang-X.Y-rt
 # but we don't want to install wasi files into libclang-rt as they have their own package
 # So, we remove this directory from the package
-	rm -f $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/wasi/
+	rm -fr $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/wasi/
 endif
 
 

From 0cdf760c395edefd40e43dc8512cb685c6b0a85a Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 23 Jul 2023 19:54:18 +0200
Subject: [PATCH 116/349] rebase of the patch

---
 debian/patches/python3-shebang.patch | 478 +++++++++++++--------------
 1 file changed, 234 insertions(+), 244 deletions(-)

diff --git a/debian/patches/python3-shebang.patch b/debian/patches/python3-shebang.patch
index 31491534..a57c8f7b 100644
--- a/debian/patches/python3-shebang.patch
+++ b/debian/patches/python3-shebang.patch
@@ -1,789 +1,779 @@
 Description: change all shebangs to Python3
  find . -name "*.py" -exec sed "s|\!/usr/bin/env python$|\!/usr/bin/env python3|g" -i {} \;
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # =- run-find-all-symbols.py - Parallel find-all-symbols runner -*- python  -*-=#
  #
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-dump.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # ===- clang-tidy-diff.py - ClangTidy Diff Checker -----------*- python -*--===#
- #
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/bindings/python/examples/cindex/cindex-dump.py
-===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/bindings/python/examples/cindex/cindex-dump.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/bindings/python/examples/cindex/cindex-dump.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/bindings/python/examples/cindex/cindex-dump.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-dump.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # ===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/bindings/python/examples/cindex/cindex-includes.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-includes.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/bindings/python/examples/cindex/cindex-includes.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/bindings/python/examples/cindex/cindex-includes.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/bindings/python/examples/cindex/cindex-includes.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-includes.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # ===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===#
  #
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/tools/scan-view/bin/scan-view
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/bin/scan-view
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/tools/scan-view/share/startfile.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/share/startfile.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/tools/scan-view/share/startfile.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/tools/scan-view/share/startfile.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/tools/scan-view/share/startfile.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/share/startfile.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # -*- coding: utf-8 -*-
  
  """Utility for opening a file using the default application in a cross-platform
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/ABITest/ABITestGen.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/ABITest/ABITestGen.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/ABITest/ABITestGen.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/ABITest/ABITestGen.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/ABITest/ABITestGen.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/ABITest/ABITestGen.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  from pprint import pprint
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CIndex/completion_logger_server.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CIndex/completion_logger_server.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/CIndex/completion_logger_server.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CIndex/completion_logger_server.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/CIndex/completion_logger_server.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CIndex/completion_logger_server.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  from __future__ import absolute_import, division, print_function
  import sys
  from socket import *
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CaptureCmd
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CaptureCmd
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/CaptureCmd
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CaptureCmd
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/CaptureCmd
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CaptureCmd
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """CaptureCmd - A generic tool for capturing information about the
  invocations of another program.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CmpDriver
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CmpDriver
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/CmpDriver
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/CmpDriver
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/CmpDriver
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CmpDriver
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  A simple utility that compares tool invocations and exit codes issued by
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/FindSpecRefs
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FindSpecRefs
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/FindSpecRefs
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/FindSpecRefs
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/FindSpecRefs
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FindSpecRefs
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import re
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/FuzzTest
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FuzzTest
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/FuzzTest
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/FuzzTest
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/FuzzTest
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FuzzTest
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  This is a generic fuzz testing tool, see --help for more information.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/TestUtils/deep-stack.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/TestUtils/deep-stack.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/TestUtils/deep-stack.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/TestUtils/deep-stack.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/TestUtils/deep-stack.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/TestUtils/deep-stack.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/CmpRuns.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/CmpRuns.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/CmpRuns.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/CmpRuns.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/CmpRuns.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/CmpRuns.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  CmpRuns - A simple tool for comparing two static analyzer runs to determine
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestAdd.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestAdd.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/SATestAdd.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestAdd.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SATestAdd.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestAdd.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Static Analyzer qualification infrastructure: adding a new project to
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestBuild.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestBuild.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/SATestBuild.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestBuild.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SATestBuild.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestBuild.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Static Analyzer qualification infrastructure.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestUpdateDiffs.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestUpdateDiffs.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/SATestUpdateDiffs.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SATestUpdateDiffs.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SATestUpdateDiffs.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestUpdateDiffs.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Update reference results for static analyzer.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SumTimerInfo.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SumTimerInfo.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/SumTimerInfo.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/SumTimerInfo.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SumTimerInfo.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SumTimerInfo.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  Script to Summarize statistics in the scan-build output.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/exploded-graph-rewriter.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/exploded-graph-rewriter.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/analyzer/exploded-graph-rewriter.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/analyzer/exploded-graph-rewriter.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/exploded-graph-rewriter.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/exploded-graph-rewriter.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # ===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--#
  #
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/check_cfc.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/check_cfc.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/check_cfc/check_cfc.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/check_cfc.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/check_cfc/check_cfc.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/check_cfc.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Check CFC - Check Compile Flow Consistency
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/obj_diff.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/obj_diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/check_cfc/obj_diff.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/obj_diff.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/check_cfc/obj_diff.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/obj_diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/test_check_cfc.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/test_check_cfc.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/check_cfc/test_check_cfc.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/check_cfc/test_check_cfc.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/check_cfc/test_check_cfc.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/test_check_cfc.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Test internal functions within check_cfc.py."""
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/modfuzz.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/modfuzz.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/modfuzz.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/modfuzz.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/modfuzz.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/modfuzz.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # To use:
  #  1) Update the 'decls' list below with your fuzzing configuration.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/token-delta.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/token-delta.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/utils/token-delta.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/utils/token-delta.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/token-delta.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/token-delta.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import absolute_import, division, print_function
  import os
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/asan/scripts/asan_symbolize.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/asan/scripts/asan_symbolize.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/asan/scripts/asan_symbolize.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/asan/scripts/asan_symbolize.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # ===- lib/asan/scripts/asan_symbolize.py -----------------------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # ===- lib/fuzzer/scripts/unbalanced_allocs.py ------------------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # ===- lib/sanitizer_common/scripts/gen_dynamic_list.py ---------------------===#
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/sanitizer_common/scripts/sancov.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/sancov.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/compiler-rt/lib/sanitizer_common/scripts/sancov.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/sancov.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # Merge or print the coverage data collected by asan's coverage.
  # Input files are sequences of 4-byte integers.
  # We need to merge these integers into a set and then
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/libcxx/utils/cat_files.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/cat_files.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/libcxx/utils/cat_files.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/libcxx/utils/cat_files.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/libcxx/utils/cat_files.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/cat_files.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # ===----------------------------------------------------------------------===##
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/libcxx/utils/generate_feature_test_macro_components.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/generate_feature_test_macro_components.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/libcxx/utils/generate_feature_test_macro_components.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/libcxx/utils/generate_feature_test_macro_components.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/libcxx/utils/generate_feature_test_macro_components.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/generate_feature_test_macro_components.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  from builtins import range
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/utils/benchmark.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lld/utils/benchmark.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lld/utils/benchmark.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/utils/benchmark.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lld/utils/benchmark.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lld/utils/benchmark.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  # See https://llvm.org/LICENSE.txt for license information.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/examples/python/file_extract.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/examples/python/file_extract.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/examples/python/file_extract.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/examples/python/file_extract.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/examples/python/file_extract.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/examples/python/file_extract.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import string
  import struct
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/packages/Python/lldbsuite/test/bench.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/bench.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/packages/Python/lldbsuite/test/bench.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/packages/Python/lldbsuite/test/bench.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/packages/Python/lldbsuite/test/bench.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/bench.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """
  A simple bench runner which delegates to the ./dotest.py test driver to run the
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import binascii
  import json
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/scripts/analyze-project-deps.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/analyze-project-deps.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/scripts/analyze-project-deps.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/scripts/analyze-project-deps.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/scripts/analyze-project-deps.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/analyze-project-deps.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import argparse
  import itertools
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/scripts/verify_api.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/verify_api.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/scripts/verify_api.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/scripts/verify_api.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/scripts/verify_api.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/verify_api.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import subprocess
  import optparse
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  '''This module implements a Finite State Machine (FSM). In addition to state
  this FSM also maintains a user defined "memory". So this FSM can be used as a
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/utils/lui/lui.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/lui.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/utils/lui/lui.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/utils/lui/lui.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/utils/lui/lui.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/lui.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  ##===-- lui.py -----------------------------------------------*- Python -*-===##
  ##
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/utils/lui/sandbox.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/sandbox.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lldb/utils/lui/sandbox.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lldb/utils/lui/sandbox.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/utils/lui/sandbox.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/sandbox.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  ##===-- sandbox.py -------------------------------------------*- Python -*-===##
  ##
  # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/BugPoint/compile-custom.ll.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/BugPoint/compile-custom.ll.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/test/BugPoint/compile-custom.ll.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/BugPoint/compile-custom.ll.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/test/BugPoint/compile-custom.ll.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/BugPoint/compile-custom.ll.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/Other/opt-bisect-helper.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/Other/opt-bisect-helper.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/test/Other/opt-bisect-helper.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/Other/opt-bisect-helper.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/test/Other/opt-bisect-helper.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/Other/opt-bisect-helper.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/TableGen/JSON-check.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/TableGen/JSON-check.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/test/TableGen/JSON-check.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/test/TableGen/JSON-check.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/test/TableGen/JSON-check.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/TableGen/JSON-check.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  import subprocess
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-diff.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/tools/opt-viewer/opt-diff.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-diff.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/opt-diff.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-diff.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-stats.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-stats.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/tools/opt-viewer/opt-stats.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-stats.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/opt-stats.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-stats.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-viewer.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-viewer.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/tools/opt-viewer/opt-viewer.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/opt-viewer.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/opt-viewer.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-viewer.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/optrecord.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/optrecord.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/tools/opt-viewer/optrecord.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/tools/opt-viewer/optrecord.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/optrecord.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/optrecord.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/Misc/zkill
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/Misc/zkill
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/Misc/zkill
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/Misc/zkill
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/Misc/zkill
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/Misc/zkill
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import re
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/abtest.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/abtest.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/abtest.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/abtest.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/abtest.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/abtest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # Given a previous good compile narrow down miscompiles.
  # Expects two directories named "before" and "after" each containing a set of
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bisect
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/bisect
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bisect
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/bisect
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  #
  # The way you use this is you create a script that takes in as its first
  # argument a count. The script passes into LLVM the count via a command
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bisect-skip-count
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect-skip-count
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/bisect-skip-count
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bisect-skip-count
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/bisect-skip-count
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect-skip-count
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # This script is used to bisect skip and count arguments for --debug-counter.
  # It is similar to bisect, except it understands how to increase skip and decrease count
  #
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bugpoint_gisel_reducer.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bugpoint_gisel_reducer.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/bugpoint_gisel_reducer.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/bugpoint_gisel_reducer.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/bugpoint_gisel_reducer.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bugpoint_gisel_reducer.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Reduces GlobalISel failures.
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/clang-parse-diagnostics-file
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/clang-parse-diagnostics-file
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/clang-parse-diagnostics-file
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/clang-parse-diagnostics-file
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/clang-parse-diagnostics-file
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/clang-parse-diagnostics-file
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import plistlib
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/create_ladder_graph.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/create_ladder_graph.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/create_ladder_graph.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/create_ladder_graph.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/create_ladder_graph.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/create_ladder_graph.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """A ladder graph creation program.
  
  This is a python program that creates c source code that will generate
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/extract_symbols.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_symbols.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/extract_symbols.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/extract_symbols.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/extract_symbols.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A tool for extracting a list of symbols to export
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/extract_vplan.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_vplan.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/extract_vplan.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/extract_vplan.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/extract_vplan.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_vplan.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # This script extracts the VPlan digraphs from the vectoriser debug messages
  # and saves them in individual dot files (one for each plan). Optionally, and
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/indirect_calls.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/indirect_calls.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/indirect_calls.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/indirect_calls.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/indirect_calls.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/indirect_calls.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A tool for looking for indirect jumps and calls in x86 binaries.
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/lit/ProgressBar.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/lit/ProgressBar.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/lit/ProgressBar.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/lit/ProgressBar.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/lit/ProgressBar.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/lit/ProgressBar.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  # Source: http://code.activestate.com/recipes/475116/, with
  # modifications by Daniel Dunbar.
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import sys
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import os
  import sys
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  import os
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import argparse
  import platform
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  import sys
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/llvm-gisel-cov.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/llvm-gisel-cov.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/llvm-gisel-cov.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/llvm-gisel-cov.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/llvm-gisel-cov.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/llvm-gisel-cov.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """
  Summarize the information in the given coverage files.
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/prepare-code-coverage-artifact.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/prepare-code-coverage-artifact.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/prepare-code-coverage-artifact.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/prepare-code-coverage-artifact.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/prepare-code-coverage-artifact.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/prepare-code-coverage-artifact.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/release/findRegressions-nightly.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-nightly.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/release/findRegressions-nightly.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/release/findRegressions-nightly.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/release/findRegressions-nightly.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-nightly.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  from __future__ import print_function
  
  import re, string, sys, os, time
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/release/findRegressions-simple.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-simple.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/release/findRegressions-simple.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/release/findRegressions-simple.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/release/findRegressions-simple.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-simple.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  from __future__ import print_function
  import re, string, sys, os, time, math
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/shuffle_fuzz.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_fuzz.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/shuffle_fuzz.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/shuffle_fuzz.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/shuffle_fuzz.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_fuzz.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A shuffle vector fuzz tester.
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/shuffle_select_fuzz_tester.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_select_fuzz_tester.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/shuffle_select_fuzz_tester.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/shuffle_select_fuzz_tester.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/shuffle_select_fuzz_tester.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_select_fuzz_tester.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """A shuffle-select vector fuzz tester.
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/sort_includes.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/sort_includes.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/sort_includes.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/sort_includes.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/sort_includes.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/sort_includes.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  
  """Script to sort the top-most block of #include lines.
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/unicode-case-fold.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/unicode-case-fold.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/unicode-case-fold.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/unicode-case-fold.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/unicode-case-fold.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/unicode-case-fold.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  """
  Unicode case folding database conversion utility
  
-Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/wciia.py
+Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/wciia.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/utils/wciia.py
-+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/utils/wciia.py
+--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/wciia.py
++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/wciia.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3

From 9624fee558c2c7a7d94775ae0e78ed074493a430 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 24 Jul 2023 08:29:24 +0200
Subject: [PATCH 117/349] Do the delete of wasi in libclang-rt regardless
 (Closes: #1041834)

---
 debian/changelog | 6 ++++++
 debian/rules     | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96da9663..f767ee89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,12 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 28 Jan 2023 18:07:40 +0100
 
+llvm-toolchain-16 (1:16.0.6-6) unstable; urgency=medium
+
+  * Do the delete of wasi in libclang-rt regardless (Closes: #1041834)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 24 Jul 2023 08:29:14 +0200
+
 llvm-toolchain-16 (1:16.0.6-5) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff --git a/debian/rules b/debian/rules
index 3fe945ae..12876980 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1293,13 +1293,11 @@ ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(shell dh_listpackages)))
 		mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/cxxabi.h \
 			$(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/cxxabi.h; \
 	fi
+endif
 # Because of hurd, we are more flexible in what we include in libclang-X.Y-rt
 # but we don't want to install wasi files into libclang-rt as they have their own package
 # So, we remove this directory from the package
 	rm -fr $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/wasi/
-endif
-
-
 
 repack_a_llvm_ir:
 ifeq (${LTO_ENABLE},yes)

From dae76954a83b8845d428b02d3097081b7e36e0c1 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 24 Jul 2023 08:33:41 +0200
Subject: [PATCH 118/349] Fix for real the libclang-rt-17-dev issue

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f767ee89..ae33213b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium
+
+  * Fix for real the libclang-rt-17-dev issue
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 24 Jul 2023 08:33:29 +0200
+
 llvm-toolchain-snapshot (1:17~++20230721092305+2ce662c5d596-1~exp1) experimental; urgency=medium
 
   * New snapshot release:

From 8ca0e630b4b861bd71c1d28b222e3691cca54b8e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 25 Jul 2023 18:25:34 +0200
Subject: [PATCH 119/349] prepare the 17 release

---
 debian/README                 |  2 +-
 debian/changelog              |  2 +-
 debian/control                |  8 ++++----
 debian/prepare-new-release.sh | 12 ++++++------
 debian/rules                  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/README b/debian/README
index 654ba44c..3f514d5b 100644
--- a/debian/README
+++ b/debian/README
@@ -9,7 +9,7 @@ The current snapshot release is maintained in the "snapshot" branch.
 The easiest way to get all branches is probably to have one
 clone per version:
 
-for f in 14 15 16 snapshot; do
+for f in 14 15 16 17 snapshot; do
     git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f
 done
 
diff --git a/debian/changelog b/debian/changelog
index ae33213b..f46ba603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium
+llvm-toolchain-17 (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium
 
   * Fix for real the libclang-rt-17-dev issue
 
diff --git a/debian/control b/debian/control
index 2e673c74..32437dc5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: llvm-toolchain-snapshot
+Source: llvm-toolchain-17
 Section: devel
 Priority: optional
 Rules-Requires-Root: no
@@ -35,8 +35,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
 Build-Conflicts: oprofile
 Standards-Version: 4.6.2
 Homepage: https://www.llvm.org/
-Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot
-Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot
+Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 17
+Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17
 
 # ------------- clang -------------
 
@@ -562,7 +562,7 @@ Description: LLVM-based linker, header files
 Package: lldb-17
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}),
  python3-lldb-17
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh
index 189482ad..69dcd4c8 100644
--- a/debian/prepare-new-release.sh
+++ b/debian/prepare-new-release.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
-ORIG_VERSION=15
-TARGET_VERSION=16
-ORIG_VERSION_2=15_0
-TARGET_VERSION_2=16_0
-ORIG_VERSION_3=150
-TARGET_VERSION_3=160
+ORIG_VERSION=16
+TARGET_VERSION=17
+ORIG_VERSION_2=16_0
+TARGET_VERSION_2=17_0
+ORIG_VERSION_3=160
+TARGET_VERSION_3=170
 
 LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control debian/tests/integration-test-suite-test debian/unpack.sh debian/tests/cmake-test debian/patches/scan-build-py-fix-default-bin.diff`
 for F in $LIST; do
diff --git a/debian/rules b/debian/rules
index 12876980..ac0a301e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1002,7 +1002,7 @@ endif
 		echo "Generating manpage of $$f"; \
 		LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD_STAGE2)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1 || true; \
 	done
-	# Create the following directory regardless as libomp-16-doc
+	# Create the following directory regardless as libomp-XX-doc
 	# is Architecture: all
 	mkdir -p openmp/runtime/doc/doxygen/generated/html/
 

From 1ceb26af34eaa3fb692a09a409ce63906ec31ed7 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 15 Aug 2023 21:19:46 +0200
Subject: [PATCH 120/349] prepare upload

---
 debian/changelog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f46ba603..0bf92f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
-llvm-toolchain-17 (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium
+llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium
 
+  * New snapshot release:
+  * Fix the libclang-rt-17-dev: ships
+    /usr/lib[...]/wasi/libclang_rt.builtins-wasm*.a, already in
+    libclang-rt-17-dev-wasm* (closes: #1041388)
+  * Also install llvm-debuginfod in llvm-X.Y
   * Fix for real the libclang-rt-17-dev issue
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 24 Jul 2023 08:33:29 +0200

From 40ed900ee9ddf7320f422d1e924e1887a80b9282 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 18 Aug 2023 12:05:48 +0200
Subject: [PATCH 121/349] prepare upload

---
 debian/changelog | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bf92f07..6510446f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,17 +7,7 @@ llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium
   * Also install llvm-debuginfod in llvm-X.Y
   * Fix for real the libclang-rt-17-dev issue
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 24 Jul 2023 08:33:29 +0200
-
-llvm-toolchain-snapshot (1:17~++20230721092305+2ce662c5d596-1~exp1) experimental; urgency=medium
-
-  * New snapshot release:
-  * Fix the libclang-rt-17-dev: ships
-    /usr/lib[...]/wasi/libclang_rt.builtins-wasm*.a, already in
-    libclang-rt-17-dev-wasm* (closes: #1041388)
-  * Also install llvm-debuginfod in llvm-X.Y
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 21 Jul 2023 09:26:43 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 15 Aug 2023 19:25:12 +0000
 
 llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental; urgency=medium
 

From d9f80962c79c769e1a4537a74d6c82d00580cc8c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 22 Aug 2023 19:23:53 +0200
Subject: [PATCH 122/349] New snapshot release

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6510446f..2ba43d94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium
+
+  * New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 22 Aug 2023 19:22:57 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium
 
   * New snapshot release:

From a9388fd4ca3d315a93a6f99357f8fbd45d5da717 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Wed, 30 Aug 2023 11:44:48 +0200
Subject: [PATCH 123/349] Disable wasm support on powerpc and powerpcspe

---
 debian/changelog | 7 +++++++
 debian/rules     | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2ba43d94..ed779edc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-17 (1:17.0.0~+rc3-1~exp2) UNRELEASED; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Disable wasm support on powerpc and powerpcspe
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Wed, 30 Aug 2023 11:44:06 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium
 
   * New snapshot release
diff --git a/debian/rules b/debian/rules
index ac0a301e..bb3466b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -409,6 +409,10 @@ ifeq (,$(filter-out $(LIBCXX_WASM_DISABLE_DISTRO), $(DISTRO)))
   LIBCXX_WASM_ENABLE=no
 endif
 
+ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe))
+  LIBCXX_WASM_ENABLE=no
+endif
+
 LLD_ENABLE=yes
 
 ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))

From 2549528c407225ffbd3ec09c465a8530af2c9928 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Wed, 30 Aug 2023 11:45:37 +0200
Subject: [PATCH 124/349] Remove powerpc from BINUTILS_GOLD_ARCHS again

---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ed779edc..22f96625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ llvm-toolchain-17 (1:17.0.0~+rc3-1~exp2) UNRELEASED; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
   * Disable wasm support on powerpc and powerpcspe
+  * Remove powerpc from BINUTILS_GOLD_ARCHS again
 
  -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Wed, 30 Aug 2023 11:44:06 +0200
 
diff --git a/debian/rules b/debian/rules
index bb3466b9..38f92b02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -271,7 +271,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes)
 	LIBCLC_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)"
 endif
 
-BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x powerpc hurd-i386 kfreebsd-amd64 kfreebsd-i386
+BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0)
 ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
 	STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold

From 7b269634e80455a65db038405c0ec92dd65bf34e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 5 Sep 2023 14:38:20 +0200
Subject: [PATCH 125/349] debian/tests/control: update gcc to 10 => 13

---
 debian/changelog     | 6 ++++++
 debian/tests/control | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 22f96625..17e81635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,12 @@ llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 22 Aug 2023 19:22:57 +0200
 
+llvm-toolchain-17 (1:17.0.0~+rc2-1~exp2) UNRELEASED; urgency=medium
+
+  * debian/tests/control: update gcc to 10 => 13
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 19 Aug 2023 10:07:19 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium
 
   * New snapshot release:
diff --git a/debian/tests/control b/debian/tests/control
index 1cff65f8..fd712f0f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -7,7 +7,7 @@ Restrictions: allow-stderr
 Architecture: amd64 arm64 i386
 
 Tests: integration-test-suite-test
-Depends: @, cmake, make, g++, libstdc++-10-dev
+Depends: @, cmake, make, g++, libstdc++-13-dev
 Restrictions: allow-stderr
 Architecture: amd64 arm64
 

From e0057b00ca8740d80748c3adf52dac2f06426b5a Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 5 Sep 2023 14:39:28 +0200
Subject: [PATCH 126/349] remove unsupported flags

---
 debian/rules | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/rules b/debian/rules
index 38f92b02..9278a8f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -816,6 +816,10 @@ build-wasm/compiler-rt-%:
 	@echo "Building compiler-rt for $(cpu)"
 	@echo "Using cmake: $(CMAKE_BIN)"
 	mkdir -p "$@"
+# remove unsupported flags
+	STAGE_2_CFLAGS=`echo $(STAGE_2_CFLAGS) | sed 's/-fcf-protection//g'`
+	STAGE_2_CXXFLAGS=`echo $(STAGE_2_CXXFLAGS) | sed 's/-fcf-protection//g'`
+
 	$(CMAKE_BIN) -B "$@" -S compiler-rt/lib/builtins/ \
 		-G Ninja \
 		$(SCCACHE_CMAKE) \

From b786bcc4b82e90c80c36b6f6fee2e113ae481ef3 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Sep 2023 08:33:35 +0200
Subject: [PATCH 127/349] fix sed?

---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 9278a8f1..c8d2ef21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -817,8 +817,8 @@ build-wasm/compiler-rt-%:
 	@echo "Using cmake: $(CMAKE_BIN)"
 	mkdir -p "$@"
 # remove unsupported flags
-	STAGE_2_CFLAGS=`echo $(STAGE_2_CFLAGS) | sed 's/-fcf-protection//g'`
-	STAGE_2_CXXFLAGS=`echo $(STAGE_2_CXXFLAGS) | sed 's/-fcf-protection//g'`
+	STAGE_2_CFLAGS=`echo $(STAGE_2_CFLAGS) | sed -e 's/-fcf-protection//g'`
+	STAGE_2_CXXFLAGS=`echo $(STAGE_2_CXXFLAGS) | sed -e 's/-fcf-protection//g'`
 
 	$(CMAKE_BIN) -B "$@" -S compiler-rt/lib/builtins/ \
 		-G Ninja \

From 9e8860e7e3ec7c77b4f900574f41bcbdbaa61e37 Mon Sep 17 00:00:00 2001
From: Samuel Henrique <samueloph@debian.org>
Date: Wed, 6 Sep 2023 21:18:18 +0100
Subject: [PATCH 128/349] Explicitly depend on libcurl4-openssl-dev

 The same change was done to 16, we don't really need this for 17 but
 it's the relase team's strong recommendation that it should be done.
---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 32437dc5..25cf3fef 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
-    libcurl4-dev,
+    libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
     protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
     libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
diff --git a/debian/control.in b/debian/control.in
index fc183864..5ed74e57 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
-    libcurl4-dev,
+    libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
     protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
     libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],

From 50df25a859164f81fdd9f9b8a8ecddd2e039dd78 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 3 Sep 2023 14:06:24 +0200
Subject: [PATCH 129/349] Disable python3-lldb on mips64el to unnreak the build

---
 debian/changelog | 8 ++++++--
 debian/rules     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 17e81635..64ca808f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-llvm-toolchain-17 (1:17.0.0~+rc3-1~exp2) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
   * Disable wasm support on powerpc and powerpcspe
   * Remove powerpc from BINUTILS_GOLD_ARCHS again
 
- -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Wed, 30 Aug 2023 11:44:06 +0200
+  [ Sylvestre Ledru ]
+  * new upstream release
+  * Disable python3-lldb on mips64el to unnreak the build
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 05 Sep 2023 14:42:18 +0200
 
 llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index c8d2ef21..b4d75d7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1208,7 +1208,7 @@ endif
 
 # Disable the python binding for buster. not sure why it regressed
 # regressed de4364f1ecaa..0745b0c0354a
-	if test "$(DISTRO)" = "buster"; then \
+	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el" then \
 		mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \
 		touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
 		echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \

From 8c67b5c9f52869a2ef31a9c091a4a9c437cccf5f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Sep 2023 22:44:48 +0200
Subject: [PATCH 130/349] Strip -fcf-protection for wasm build - new flag added
 in dpkg 1.22

---
 debian/changelog |  6 ++++++
 debian/rules     | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64ca808f..8de618cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.0~+rc4-1~exp2) experimental; urgency=medium
+
+  * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 06 Sep 2023 22:44:15 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
diff --git a/debian/rules b/debian/rules
index b4d75d7a..2626895e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -811,15 +811,15 @@ ifndef LLVM_SPIRV
 endif
 	touch $@
 
+# Remove some new flags introduced by dpkg 1.22.0;
+STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g")
+STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g")
+
 build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%)
 build-wasm/compiler-rt-%:
 	@echo "Building compiler-rt for $(cpu)"
 	@echo "Using cmake: $(CMAKE_BIN)"
 	mkdir -p "$@"
-# remove unsupported flags
-	STAGE_2_CFLAGS=`echo $(STAGE_2_CFLAGS) | sed -e 's/-fcf-protection//g'`
-	STAGE_2_CXXFLAGS=`echo $(STAGE_2_CXXFLAGS) | sed -e 's/-fcf-protection//g'`
-
 	$(CMAKE_BIN) -B "$@" -S compiler-rt/lib/builtins/ \
 		-G Ninja \
 		$(SCCACHE_CMAKE) \
@@ -829,8 +829,8 @@ build-wasm/compiler-rt-%:
 		-DCMAKE_ASM_COMPILER_TARGET=$(cpu)-unknown-unknown \
 		-DCMAKE_C_COMPILER=$(STAGE_2_BIN_DIR)/clang \
 		-DCMAKE_CXX_COMPILER=$(STAGE_2_BIN_DIR)/clang++ \
-		-DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_CFLAGS)" \
-		-DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_CXXFLAGS)" \
+		-DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_WASM_CFLAGS)" \
+		-DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_WASM_CXXFLAGS)" \
 		-DCMAKE_SHARED_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
 		-DCMAKE_MODULE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
 		-DCMAKE_EXE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \

From f5a39a82c68e50ddb84db5eff5211553bb92d4b1 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Sep 2023 23:05:16 +0200
Subject: [PATCH 131/349] improve the changelog

---
 debian/changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8de618cd..12b51302 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp2) experimental; urgency=medium
 
   * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22
+  * Explicitly depend on libcurl4-openssl-dev
+    Thanks to Samuel Henrique for the fix
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 06 Sep 2023 22:44:15 +0200
 
@@ -12,7 +14,7 @@ llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium
 
   [ Sylvestre Ledru ]
   * new upstream release
-  * Disable python3-lldb on mips64el to unnreak the build
+  * Disable python3-lldb on mips64el to unbreak the build
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 05 Sep 2023 14:42:18 +0200
 

From 75890d4400ecee6c104015def6eefa4f875fd53c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 7 Sep 2023 13:30:14 +0200
Subject: [PATCH 132/349] fix typo

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 2626895e..c68935e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1208,7 +1208,7 @@ endif
 
 # Disable the python binding for buster. not sure why it regressed
 # regressed de4364f1ecaa..0745b0c0354a
-	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el" then \
+	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \
 		mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \
 		touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
 		echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \

From 3fdc3c39207b174d7ec7166963ee23843329d26b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 7 Sep 2023 13:49:26 +0200
Subject: [PATCH 133/349] fix conflict

---
 debian/control | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 56de656e..ca2eea7b 100644
--- a/debian/control
+++ b/debian/control
@@ -687,13 +687,8 @@ Package: libc++-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-<<<<<<< HEAD
 Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends},
- libunwind-17-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64]
-=======
-Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends},
- libunwind-16-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
->>>>>>> origin/16
+ libunwind-17-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev

From 7d266ab1bf05bf8527b80ab4d274ccd8d1898225 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Thu, 7 Sep 2023 23:03:57 +0200
Subject: [PATCH 134/349] Update control file

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index ca2eea7b..a8673fbc 100644
--- a/debian/control
+++ b/debian/control
@@ -934,7 +934,7 @@ Package: flang-17
 # no 32bit support
 # https://github.com/llvm/llvm-project/issues/59845
 Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-16-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-17-dev (= ${binary:Version}),
 Provides: fortran-compiler, gfortran-mod-15
 Description: Fortran compiler
  Ground-up implementation of a Fortran front end written in

From d2910da585491513f6a343cce17374c8b0c48673 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Thu, 7 Sep 2023 23:06:13 +0200
Subject: [PATCH 135/349] Upload to experimental

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a03eff12..bf0f98bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-17 (1:17.0.0~+rc4-1~exp3) experimental; urgency=medium
+
+  * Update control file
+  * Fixup build failures from 16 branch
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 07 Sep 2023 23:04:28 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp2) experimental; urgency=medium
 
   * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22

From a9459c0b9511fb6c76a9a188b3673131a37b9c15 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 8 Sep 2023 13:49:42 +0200
Subject: [PATCH 136/349] Also ignore "-mbranch-protection=standard" (used on
 arm64)

---
 debian/changelog | 6 ++++++
 debian/rules     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf0f98bd..248eefad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.0~+rc4-1~exp4) experimental; urgency=medium
+
+  * Also ignore "-mbranch-protection=standard" (used on arm64)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 08 Sep 2023 13:49:38 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp3) experimental; urgency=medium
 
   * Update control file
diff --git a/debian/rules b/debian/rules
index 00c4d358..9b6e8def 100755
--- a/debian/rules
+++ b/debian/rules
@@ -815,8 +815,8 @@ endif
 	touch $@
 
 # Remove some new flags introduced by dpkg 1.22.0;
-STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g")
-STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g")
+STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g" -e "s/-mbranch-protection=standard//g")
+STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g" -e "s/-mbranch-protection=standard//g")
 
 build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%)
 build-wasm/compiler-rt-%:

From 9467550d9170c2f2068a88fc767eae59a1bc717a Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 10 Sep 2023 08:23:15 +0200
Subject: [PATCH 137/349] Don't depend on spirv, the version 16 is too old to
 work

[2747/2769] cd "/<<PKGBUILDDIR>>/libclc/build" && "/<<PKGBUILDDIR>>/build-llvm/tools/clang/stage2-bins/bin/opt" -o builtins.opt.spirv-mesa3d-.bc builtins.link.spirv-mesa3d-.bc
[2748/2769] cd "/<<PKGBUILDDIR>>/libclc/build" && /usr/bin/llvm-spirv-16 --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc
FAILED: spirv-mesa3d-.spv /<<PKGBUILDDIR>>/libclc/build/spirv-mesa3d-.spv
cd "/<<PKGBUILDDIR>>/libclc/build" && /usr/bin/llvm-spirv-16 --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc
Not implemented!
UNREACHABLE executed at ./lib/SPIRV/SPIRVWriter.cpp:477!
PLEASE submit a bug report to https://github.com/llvm/llvm-project/issues/ and include the crash backtrace.
Stack dump:
0.	Program arguments: /usr/bin/llvm-spirv-16 --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc
Stack dump without symbol names (ensure you have llvm-symbolizer in your PATH or set the environment var `LLVM_SYMBOLIZER_PATH` to point to it):
0  libLLVM-16.so.1       0x00007fd129ae9be6 llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) + 54
1  libLLVM-16.so.1       0x00007fd129ae7e30 llvm::sys::RunSignalHandlers() + 80
2  libLLVM-16.so.1       0x00007fd129aea3bb
3  libc.so.6             0x00007fd128720510
4  libc.so.6             0x00007fd12876e0fc
5  libc.so.6             0x00007fd128720472 gsignal + 18
6  libc.so.6             0x00007fd12870a4b2 abort + 211
7  libLLVM-16.so.1       0x00007fd129a31a30 LLVMInstallFatalErrorHandler + 0
8  libLLVMSPIRVLib.so.16 0x00007fd1303695af
9  libLLVMSPIRVLib.so.16 0x00007fd13036c630
10 libLLVMSPIRVLib.so.16 0x00007fd13036ca2f
11 libLLVMSPIRVLib.so.16 0x00007fd13036f66e
12 libLLVMSPIRVLib.so.16 0x00007fd13037311f
13 libLLVMSPIRVLib.so.16 0x00007fd1303734b7
14 libLLVMSPIRVLib.so.16 0x00007fd13037363a
15 libLLVMSPIRVLib.so.16 0x00007fd1303737b1
16 libLLVMSPIRVLib.so.16 0x00007fd130352d4e
17 llvm-spirv-16         0x0000564c5c1d6cd0
18 libc.so.6             0x00007fd12870b6ca
19 libc.so.6             0x00007fd12870b785 __libc_start_main + 133
20 llvm-spirv-16         0x0000564c5c1d73d1
Aborted
[2749/2769] cd "/<<PKGBUILDDIR>>/libclc/build" && "/<<PKGBUILDDIR>>/build-llvm/tools/clang/stage2-bins/bin/opt" -O3 -o builtins.opt.cedar-r600--.bc builtins.link.cedar-r600--.bc
[2750/2769] cd "/<<PKGBUILDDIR>>/libclc/build" && "/<<PKGBUILDDIR>>/build-llvm/tools/clang/stage2-bins/bin/opt" -O3 -o builtins.opt.cayman-r600--.bc builtins.link.cayman-r600--.bc
---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 4b8ec767..ba78b466 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+#    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,
diff --git a/debian/control.in b/debian/control.in
index 6df959fa..43f5aae9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+#    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,

From b6d28f83468404404dd8837a561e88af9eacad8b Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 10 Sep 2023 08:49:46 +0200
Subject: [PATCH 138/349] Update changelog

---
 debian/changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5009b132..d4ae8966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp4) experimental; urgency=medium
 
+  [ Gianfranco Costamagna ]
+  * Don't depend on spirv, the version 16 is too old to work
+
+  [ Sylvestre Ledru ]
   * Also ignore "-mbranch-protection=standard" (used on arm64)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 08 Sep 2023 13:49:38 +0200

From a4366d1be29a74205a0e82821c28bd38eca7ed92 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 10 Sep 2023 19:18:43 +0200
Subject: [PATCH 139/349] Make sure we use at least spirv 17, FTBFS otherwise

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index e8dc5bf5..a44eeee6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -259,7 +259,7 @@ endif
 ifndef LLVM_SPIRV
 	LLVM_SPIRV_INSTALLED = no
 else
-	ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 14.0.0 ; echo $$?),0)
+	ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 17.0.0 ; echo $$?),0)
 # Too old llvm-spirv version are failing. See #52200
 		LLVM_SPIRV_INSTALLED = yes
 	else

From ccce4c11df6cb3aa68f8423aa9ad7ef55a65455f Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 12 Sep 2023 09:03:59 +0200
Subject: [PATCH 140/349] Add patch D158066 from llvm-toolchain-16 branch

---
 debian/patches/D158066.patch | 355 +++++++++++++++++++++++++++++++++++
 debian/patches/series        |   1 +
 2 files changed, 356 insertions(+)
 create mode 100644 debian/patches/D158066.patch

diff --git a/debian/patches/D158066.patch b/debian/patches/D158066.patch
new file mode 100644
index 00000000..8db4a92f
--- /dev/null
+++ b/debian/patches/D158066.patch
@@ -0,0 +1,355 @@
+Description: Fix SIMD compatibility headers on ppc64el
+Origin/Author: https://reviews.llvm.org/D158066
+Bug-Debian: https://bugs.debian.org/1049362
+
+diff --git a/clang/include/clang/Basic/BuiltinsPPC.def b/clang/include/clang/Basic/BuiltinsPPC.def
+--- a/clang/include/clang/Basic/BuiltinsPPC.def
++++ b/clang/include/clang/Basic/BuiltinsPPC.def
+@@ -151,8 +151,10 @@
+ TARGET_BUILTIN(__builtin_ppc_extract_sig, "ULLid", "", "power9-vector")
+ BUILTIN(__builtin_ppc_mtfsb0, "vUIi", "")
+ BUILTIN(__builtin_ppc_mtfsb1, "vUIi", "")
++BUILTIN(__builtin_ppc_mffs, "d", "")
+ BUILTIN(__builtin_ppc_mtfsf, "vUIiUi", "")
+ BUILTIN(__builtin_ppc_mtfsfi, "vUIiUIi", "")
++BUILTIN(__builtin_ppc_set_fpscr_rn, "di", "")
+ TARGET_BUILTIN(__builtin_ppc_insert_exp, "ddULLi", "", "power9-vector")
+ BUILTIN(__builtin_ppc_fmsub, "dddd", "")
+ BUILTIN(__builtin_ppc_fmsubs, "ffff", "")
+diff --git a/clang/lib/Basic/Targets/PPC.cpp b/clang/lib/Basic/Targets/PPC.cpp
+--- a/clang/lib/Basic/Targets/PPC.cpp
++++ b/clang/lib/Basic/Targets/PPC.cpp
+@@ -262,6 +262,10 @@
+   Builder.defineMacro("__builtin_minfe", "__builtin_ppc_minfe");
+   Builder.defineMacro("__builtin_minfl", "__builtin_ppc_minfl");
+   Builder.defineMacro("__builtin_minfs", "__builtin_ppc_minfs");
++  Builder.defineMacro("__builtin_mffs", "__builtin_ppc_mffs");
++  Builder.defineMacro("__builtin_mffsl", "__builtin_ppc_mffsl");
++  Builder.defineMacro("__builtin_mtfsf", "__builtin_ppc_mtfsf");
++  Builder.defineMacro("__builtin_set_fpscr_rn", "__builtin_ppc_set_fpscr_rn");
+ }
+ 
+ /// PPCTargetInfo::getTargetDefines - Return a set of the PowerPC-specific
+diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
+--- a/clang/lib/CodeGen/CGBuiltin.cpp
++++ b/clang/lib/CodeGen/CGBuiltin.cpp
+@@ -17062,6 +17062,11 @@
+     Value *Op1 = EmitScalarExpr(E->getArg(1));
+     return Builder.CreateFDiv(Op0, Op1, "swdiv");
+   }
++  case PPC::BI__builtin_ppc_set_fpscr_rn:
++    return Builder.CreateCall(CGM.getIntrinsic(Intrinsic::ppc_setrnd),
++                              {EmitScalarExpr(E->getArg(0))});
++  case PPC::BI__builtin_ppc_mffs:
++    return Builder.CreateCall(CGM.getIntrinsic(Intrinsic::ppc_readflm));
+   }
+ }
+ 
+diff --git a/clang/lib/Headers/ppc_wrappers/smmintrin.h b/clang/lib/Headers/ppc_wrappers/smmintrin.h
+--- a/clang/lib/Headers/ppc_wrappers/smmintrin.h
++++ b/clang/lib/Headers/ppc_wrappers/smmintrin.h
+@@ -14,7 +14,7 @@
+ 
+ #ifndef NO_WARN_X86_INTRINSICS
+ /* This header is distributed to simplify porting x86_64 code that
+-   makes explicit use of Intel intrinsics to powerp64/powerpc64le.
++   makes explicit use of Intel intrinsics to powerpc64/powerpc64le.
+ 
+    It is the user's responsibility to determine if the results are
+    acceptable and make additional changes as necessary.
+@@ -68,10 +68,10 @@
+     __asm__("mffsce %0" : "=f"(__fpscr_save.__fr));
+     __enables_save.__fpscr = __fpscr_save.__fpscr & 0xf8;
+ #else
+-    __fpscr_save.__fr = __builtin_mffs();
++    __fpscr_save.__fr = __builtin_ppc_mffs();
+     __enables_save.__fpscr = __fpscr_save.__fpscr & 0xf8;
+     __fpscr_save.__fpscr &= ~0xf8;
+-    __builtin_mtfsf(0b00000011, __fpscr_save.__fr);
++    __builtin_ppc_mtfsf(0b00000011, __fpscr_save.__fr);
+ #endif
+     /* Insert an artificial "read/write" reference to the variable
+        read below, to ensure the compiler does not schedule
+@@ -83,10 +83,15 @@
+ 
+   switch (__rounding) {
+   case _MM_FROUND_TO_NEAREST_INT:
+-    __fpscr_save.__fr = __builtin_mffsl();
++#ifdef _ARCH_PWR9
++    __fpscr_save.__fr = __builtin_ppc_mffsl();
++#else
++    __fpscr_save.__fr = __builtin_ppc_mffs();
++    __fpscr_save.__fpscr &= 0x70007f0ffL;
++#endif
+     __attribute__((fallthrough));
+   case _MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC:
+-    __builtin_set_fpscr_rn(0b00);
++    __builtin_ppc_set_fpscr_rn(0b00);
+     /* Insert an artificial "read/write" reference to the variable
+        read below, to ensure the compiler does not schedule
+        a read/use of the variable before the FPSCR is modified, above.
+@@ -102,7 +107,7 @@
+        This can be removed if and when GCC PR102783 is fixed.
+      */
+     __asm__("" : : "wa"(__r));
+-    __builtin_set_fpscr_rn(__fpscr_save.__fpscr);
++    __builtin_ppc_set_fpscr_rn(__fpscr_save.__fpscr);
+     break;
+   case _MM_FROUND_TO_NEG_INF:
+   case _MM_FROUND_TO_NEG_INF | _MM_FROUND_NO_EXC:
+@@ -128,9 +133,14 @@
+      */
+     __asm__("" : : "wa"(__r));
+     /* Restore enabled exceptions.  */
+-    __fpscr_save.__fr = __builtin_mffsl();
++#ifdef _ARCH_PWR9
++    __fpscr_save.__fr = __builtin_ppc_mffsl();
++#else
++    __fpscr_save.__fr = __builtin_ppc_mffs();
++    __fpscr_save.__fpscr &= 0x70007f0ffL;
++#endif
+     __fpscr_save.__fpscr |= __enables_save.__fpscr;
+-    __builtin_mtfsf(0b00000011, __fpscr_save.__fr);
++    __builtin_ppc_mtfsf(0b00000011, __fpscr_save.__fr);
+   }
+   return (__m128d)__r;
+ }
+@@ -159,10 +169,10 @@
+     __asm__("mffsce %0" : "=f"(__fpscr_save.__fr));
+     __enables_save.__fpscr = __fpscr_save.__fpscr & 0xf8;
+ #else
+-    __fpscr_save.__fr = __builtin_mffs();
++    __fpscr_save.__fr = __builtin_ppc_mffs();
+     __enables_save.__fpscr = __fpscr_save.__fpscr & 0xf8;
+     __fpscr_save.__fpscr &= ~0xf8;
+-    __builtin_mtfsf(0b00000011, __fpscr_save.__fr);
++    __builtin_ppc_mtfsf(0b00000011, __fpscr_save.__fr);
+ #endif
+     /* Insert an artificial "read/write" reference to the variable
+        read below, to ensure the compiler does not schedule
+@@ -174,10 +184,15 @@
+ 
+   switch (__rounding) {
+   case _MM_FROUND_TO_NEAREST_INT:
+-    __fpscr_save.__fr = __builtin_mffsl();
++#ifdef _ARCH_PWR9
++    __fpscr_save.__fr = __builtin_ppc_mffsl();
++#else
++    __fpscr_save.__fr = __builtin_ppc_mffs();
++    __fpscr_save.__fpscr &= 0x70007f0ffL;
++#endif
+     __attribute__((fallthrough));
+   case _MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC:
+-    __builtin_set_fpscr_rn(0b00);
++    __builtin_ppc_set_fpscr_rn(0b00);
+     /* Insert an artificial "read/write" reference to the variable
+        read below, to ensure the compiler does not schedule
+        a read/use of the variable before the FPSCR is modified, above.
+@@ -193,7 +208,7 @@
+        This can be removed if and when GCC PR102783 is fixed.
+      */
+     __asm__("" : : "wa"(__r));
+-    __builtin_set_fpscr_rn(__fpscr_save.__fpscr);
++    __builtin_ppc_set_fpscr_rn(__fpscr_save.__fpscr);
+     break;
+   case _MM_FROUND_TO_NEG_INF:
+   case _MM_FROUND_TO_NEG_INF | _MM_FROUND_NO_EXC:
+@@ -219,9 +234,14 @@
+      */
+     __asm__("" : : "wa"(__r));
+     /* Restore enabled exceptions.  */
+-    __fpscr_save.__fr = __builtin_mffsl();
++#ifdef _ARCH_PWR9
++    __fpscr_save.__fr = __builtin_ppc_mffsl();
++#else
++    __fpscr_save.__fr = __builtin_ppc_mffs();
++    __fpscr_save.__fpscr &= 0x70007f0ffL;
++#endif
+     __fpscr_save.__fpscr |= __enables_save.__fpscr;
+-    __builtin_mtfsf(0b00000011, __fpscr_save.__fr);
++    __builtin_ppc_mtfsf(0b00000011, __fpscr_save.__fr);
+   }
+   return (__m128)__r;
+ }
+diff --git a/clang/test/CodeGen/PowerPC/builtins-ppc.c b/clang/test/CodeGen/PowerPC/builtins-ppc.c
+--- a/clang/test/CodeGen/PowerPC/builtins-ppc.c
++++ b/clang/test/CodeGen/PowerPC/builtins-ppc.c
+@@ -1,5 +1,8 @@
+ // REQUIRES: powerpc-registered-target
+-// RUN: %clang_cc1 -triple powerpc-unknown-unknown -emit-llvm %s -o - | FileCheck %s
++// RUN: %clang_cc1 -triple powerpc-unknown-unknown -emit-llvm %s -o - \
++// RUN:   | FileCheck %s
++// RUN: %clang_cc1 -triple powerpc-unknown-unknown -emit-llvm %s -o - \
++// RUN:   -target-cpu pwr9 | FileCheck %s --check-prefixes=P9,CHECK
+ 
+ void test_eh_return_data_regno()
+ {
+@@ -26,6 +29,9 @@
+ 
+   // CHECK: call double @llvm.ppc.setrnd(i32 %2)
+   res = __builtin_setrnd(x);
++
++  // CHECK: call double @llvm.ppc.setrnd(i32 %4)
++  res = __builtin_ppc_set_fpscr_rn(x);
+ }
+ 
+ void test_builtin_ppc_flm() {
+@@ -33,7 +39,10 @@
+   // CHECK: call double @llvm.ppc.readflm()
+   res = __builtin_readflm();
+ 
+-  // CHECK: call double @llvm.ppc.setflm(double %1)
++  // CHECK: call double @llvm.ppc.readflm()
++  res = __builtin_ppc_mffs();
++
++  // CHECK: call double @llvm.ppc.setflm(double %2)
+   res = __builtin_setflm(res);
+ }
+ 
+diff --git a/clang/test/CodeGen/PowerPC/ppc-emmintrin.c b/clang/test/CodeGen/PowerPC/ppc-emmintrin.c
+--- a/clang/test/CodeGen/PowerPC/ppc-emmintrin.c
++++ b/clang/test/CodeGen/PowerPC/ppc-emmintrin.c
+@@ -8,6 +8,11 @@
+ // RUN: %clang -S -emit-llvm -target powerpc64le-unknown-linux-gnu -mcpu=pwr10 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
+ // RUN:   -ffp-contract=off -fno-discard-value-names -mllvm -disable-llvm-optzns -o - | llvm-cxxfilt -n | FileCheck %s --check-prefixes=CHECK-P10
+ 
++// RUN: %clang -x c++ -S -emit-llvm -target powerpc64le-unknown-linux-gnu -mcpu=pwr8 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
++// RUN:   -ffp-contract=off -fno-discard-value-names -mllvm -disable-llvm-optzns -fsyntax-only
++// RUN: %clang -x c++ -S -emit-llvm -target powerpc64le-unknown-linux-gnu -mcpu=pwr10 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
++// RUN:   -ffp-contract=off -fno-discard-value-names -mllvm -disable-llvm-optzns -fsyntax-only
++
+ // RUN: %clang -S -emit-llvm -target powerpc64-ibm-aix -mcpu=pwr8 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
+ // RUN:   -ffp-contract=off -fno-discard-value-names -mllvm -disable-llvm-optzns -o - | llvm-cxxfilt -n | FileCheck %s --check-prefixes=CHECK,CHECK-BE
+ // RUN: %clang -S -emit-llvm -target powerpc64-ibm-aix -mcpu=pwr10 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
+diff --git a/clang/test/CodeGen/PowerPC/ppc-mmintrin.c b/clang/test/CodeGen/PowerPC/ppc-mmintrin.c
+--- a/clang/test/CodeGen/PowerPC/ppc-mmintrin.c
++++ b/clang/test/CodeGen/PowerPC/ppc-mmintrin.c
+@@ -9,6 +9,11 @@
+ // RUN: %clang -S -emit-llvm -target powerpc64le-unknown-linux-gnu -mcpu=pwr9 -DNO_WARN_X86_INTRINSICS %s \
+ // RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -o - | llvm-cxxfilt -n| FileCheck %s --check-prefixes=CHECK-P9,CHECK,CHECK-LE
+ 
++// RUN: %clang -x c++ -S -emit-llvm -target powerpc64le-unknown-linux-gnu -mcpu=pwr8 -DNO_WARN_X86_INTRINSICS %s \
++// RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -fsyntax-only
++// RUN: %clang -x c++ -S -emit-llvm -target powerpc64le-unknown-linux-gnu -mcpu=pwr9 -DNO_WARN_X86_INTRINSICS %s \
++// RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -fsyntax-only
++
+ // RUN: %clang -S -emit-llvm -target powerpc64-unknown-freebsd13.0 -mcpu=pwr8 -DNO_WARN_X86_INTRINSICS %s \
+ // RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -o - | llvm-cxxfilt -n | FileCheck %s --check-prefixes=CHECK-P8,CHECK,CHECK-BE
+ // RUN: %clang -S -emit-llvm -target powerpc64le-unknown-freebsd13.0 -mcpu=pwr8 -DNO_WARN_X86_INTRINSICS %s \
+diff --git a/clang/test/CodeGen/PowerPC/ppc-pmmintrin.c b/clang/test/CodeGen/PowerPC/ppc-pmmintrin.c
+--- a/clang/test/CodeGen/PowerPC/ppc-pmmintrin.c
++++ b/clang/test/CodeGen/PowerPC/ppc-pmmintrin.c
+@@ -13,6 +13,9 @@
+ // RUN: %clang -S -emit-llvm -target powerpc64-ibm-aix -mcpu=pwr8 -DNO_MM_MALLOC -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
+ // RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -o - | llvm-cxxfilt -n | FileCheck %s
+ 
++// RUN: %clang -x c++ -S -emit-llvm -target powerpc64le-gnu-linux -mcpu=pwr8 -DNO_MM_MALLOC -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
++// RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -fsyntax-only
++
+ #include <pmmintrin.h>
+ 
+ __m128d resd, md1, md2;
+diff --git a/clang/test/CodeGen/PowerPC/ppc-smmintrin.c b/clang/test/CodeGen/PowerPC/ppc-smmintrin.c
+--- a/clang/test/CodeGen/PowerPC/ppc-smmintrin.c
++++ b/clang/test/CodeGen/PowerPC/ppc-smmintrin.c
+@@ -15,6 +15,11 @@
+ // RUN: %clang -S -emit-llvm -target powerpc64-unknown-linux-gnu -mcpu=pwr10 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
+ // RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -o - | llvm-cxxfilt -n | FileCheck %s --check-prefix=P10
+ 
++// RUN: %clang -x c++ -S -emit-llvm -target powerpc64le-unknown-linux-gnu -mcpu=pwr8 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
++// RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -fsyntax-only
++// RUN: %clang -x c++ -S -emit-llvm -target powerpc64le-unknown-linux-gnu -mcpu=pwr10 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
++// RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -fsyntax-only
++
+ // RUN: %clang -S -emit-llvm -target powerpc64le-unknown-freebsd13.0 -mcpu=pwr8 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
+ // RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -o - | llvm-cxxfilt -n | FileCheck %s
+ // RUN: %clang -S -emit-llvm -target powerpc64-unknown-freebsd13.0 -mcpu=pwr8 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
+@@ -239,44 +244,48 @@
+ // CHECK-LABEL: @test_round
+ 
+ // CHECK-LABEL: define available_externally <4 x float> @_mm_round_ps(<4 x float> noundef %{{[0-9a-zA-Z_.]+}}, i32 noundef signext %{{[0-9a-zA-Z_.]+}})
+-// CHECK: call signext i32 @__builtin_mffs()
+-// CHECK: call signext i32 @__builtin_mtfsf(i32 noundef signext 3, double noundef %{{[0-9a-zA-Z_.]+}})
++// CHECK: call double @llvm.ppc.readflm()
++// CHECK: call void @llvm.ppc.mtfsf(i32 3, double %{{[0-9a-zA-Z_.]+}})
+ // CHECK: %{{[0-9a-zA-Z_.]+}} = call <4 x float> asm "", "=^wa,0"
+-// CHECK: call signext i32 @__builtin_mffsl()
+-// CHECK: call signext i32 @__builtin_set_fpscr_rn(i32 noundef signext 0)
++// CHECK: call double @llvm.ppc.readflm()
++// P10: call double @llvm.ppc.mffsl()
++// CHECK: call double @llvm.ppc.setrnd(i32 0)
+ // CHECK: %{{[0-9a-zA-Z_.]+}} = call <4 x float> asm "", "=^wa,0"
+ // CHECK: call <4 x float> @vec_rint(float vector[4])
+ // CHECK: call void asm sideeffect "", "^wa"
+-// CHECK: call signext i32 @__builtin_set_fpscr_rn(i64 noundef %{{[0-9a-zA-Z_.]+}})
++// CHECK: call double @llvm.ppc.setrnd(i32 %{{[0-9a-zA-Z_.]+}})
+ // CHECK: call <4 x float> @vec_floor(float vector[4])
+ // CHECK: call <4 x float> @vec_ceil(float vector[4])
+ // CHECK: call <4 x float> @vec_trunc(float vector[4])
+ // CHECK: call <4 x float> @vec_rint(float vector[4])
+ // CHECK: call void asm sideeffect "", "^wa"
+-// CHECK: call signext i32 @__builtin_mffsl()
+-// CHECK: call signext i32 @__builtin_mtfsf(i32 noundef signext 3, double noundef %{{[0-9a-zA-Z_.]+}})
++// CHECK: call double @llvm.ppc.readflm()
++// P10: call double @llvm.ppc.mffsl()
++// CHECK: call void @llvm.ppc.mtfsf(i32 3, double %{{[0-9a-zA-Z_.]+}})
+ 
+ // CHECK-LABEL: define available_externally <4 x float> @_mm_round_ss(<4 x float> noundef %{{[0-9a-zA-Z_.]+}}, <4 x float> noundef %{{[0-9a-zA-Z_.]+}}, i32 noundef signext %{{[0-9a-zA-Z_.]+}})
+ // CHECK: call <4 x float> @_mm_round_ps(<4 x float> noundef %{{[0-9a-zA-Z_.]+}}, i32 noundef signext %{{[0-9a-zA-Z_.]+}})
+ // CHECK: extractelement <4 x float> %{{[0-9a-zA-Z_.]+}}, i32 0
+ 
+ // CHECK-LABEL: define available_externally <2 x double> @_mm_round_pd(<2 x double> noundef %{{[0-9a-zA-Z_.]+}}, i32 noundef signext %{{[0-9a-zA-Z_.]+}})
+-// CHECK: call signext i32 @__builtin_mffs()
+-// CHECK: call signext i32 @__builtin_mtfsf(i32 noundef signext 3, double noundef %{{[0-9a-zA-Z_.]+}})
++// CHECK: call double @llvm.ppc.readflm()
++// CHECK: call void @llvm.ppc.mtfsf(i32 3, double %{{[0-9a-zA-Z_.]+}})
+ // CHECK: %{{[0-9a-zA-Z_.]+}} = call <2 x double> asm "", "=^wa,0"
+-// CHECK: call signext i32 @__builtin_mffsl()
+-// CHECK: call signext i32 @__builtin_set_fpscr_rn(i32 noundef signext 0)
++// CHECK: call double @llvm.ppc.readflm()
++// P10: call double @llvm.ppc.mffsl()
++// CHECK: call double @llvm.ppc.setrnd(i32 0)
+ // CHECK: %{{[0-9a-zA-Z_.]+}} = call <2 x double> asm "", "=^wa,0"
+ // CHECK: call <2 x double> @vec_rint(double vector[2])
+ // CHECK: call void asm sideeffect "", "^wa"
+-// CHECK: call signext i32 @__builtin_set_fpscr_rn(i64 noundef %{{[0-9a-zA-Z_.]+}})
++// CHECK: call double @llvm.ppc.setrnd(i32 %{{[0-9a-zA-Z_.]+}})
+ // CHECK: call <2 x double> @vec_floor(double vector[2])
+ // CHECK: call <2 x double> @vec_ceil(double vector[2])
+ // CHECK: call <2 x double> @vec_trunc(double vector[2])
+ // CHECK: call <2 x double> @vec_rint(double vector[2])
+ // CHECK: call void asm sideeffect "", "^wa"
+-// CHECK: call signext i32 @__builtin_mffsl()
+-// CHECK: call signext i32 @__builtin_mtfsf(i32 noundef signext 3, double noundef %{{[0-9a-zA-Z_.]+}})
++// CHECK: call double @llvm.ppc.readflm()
++// P10: call double @llvm.ppc.mffsl()
++// CHECK: call void @llvm.ppc.mtfsf(i32 3, double %{{[0-9a-zA-Z_.]+}})
+ 
+ // CHECK-LABEL: define available_externally <2 x double> @_mm_round_sd(<2 x double> noundef %{{[0-9a-zA-Z_.]+}}, <2 x double> noundef %{{[0-9a-zA-Z_.]+}}, i32 noundef signext %{{[0-9a-zA-Z_.]+}})
+ // CHECK: call <2 x double> @_mm_round_pd(<2 x double> noundef %{{[0-9a-zA-Z_.]+}}, i32 noundef signext %{{[0-9a-zA-Z_.]+}})
+diff --git a/clang/test/CodeGen/PowerPC/ppc-tmmintrin.c b/clang/test/CodeGen/PowerPC/ppc-tmmintrin.c
+--- a/clang/test/CodeGen/PowerPC/ppc-tmmintrin.c
++++ b/clang/test/CodeGen/PowerPC/ppc-tmmintrin.c
+@@ -13,6 +13,9 @@
+ // RUN: %clang -S -emit-llvm -target powerpc64-ibm-aix -mcpu=pwr8 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
+ // RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -o - | llvm-cxxfilt -n | FileCheck %s --check-prefixes=CHECK,CHECK-BE
+ 
++// RUN: %clang -x c++ -S -emit-llvm -target powerpc64le-gnu-linux -mcpu=pwr8 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
++// RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -fsyntax-only
++
+ #include <tmmintrin.h>
+ 
+ __m64 res, m1, m2;
+diff --git a/clang/test/CodeGen/PowerPC/ppc-x86gprintrin.c b/clang/test/CodeGen/PowerPC/ppc-x86gprintrin.c
+--- a/clang/test/CodeGen/PowerPC/ppc-x86gprintrin.c
++++ b/clang/test/CodeGen/PowerPC/ppc-x86gprintrin.c
+@@ -12,6 +12,9 @@
+ // RUN: %clang -S -emit-llvm -target powerpc64-ibm-aix -mcpu=pwr7 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
+ // RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -o - | llvm-cxxfilt -n | FileCheck %s
+ 
++// RUN: %clang -x c++ -S -emit-llvm -target powerpc64le-unknown-linux-gnu -mcpu=pwr7 -ffreestanding -DNO_WARN_X86_INTRINSICS %s \
++// RUN:   -fno-discard-value-names -mllvm -disable-llvm-optzns -fsyntax-only
++
+ #include <x86gprintrin.h>
+ 
+ unsigned short us;
diff --git a/debian/patches/series b/debian/patches/series
index 333e2cc8..6a2193ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -147,3 +147,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
+D158066.patch

From c6388ffd4aefd78d14850e1244985791cb787d13 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 12 Sep 2023 09:04:11 +0200
Subject: [PATCH 141/349] Update changelog

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d4ae8966..c327a957 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+llvm-toolchain-17 (1:17.0.0~+rc4-1~exp5) UNRELEASED; urgency=medium
+
+  * debian/patches/D158066.patch:
+    - cherry-pick change from 1:16.0.6-11
+  * Make sure at least spirv 17 is used, FTBFS with older version
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 12 Sep 2023 08:51:38 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp4) experimental; urgency=medium
 
   [ Gianfranco Costamagna ]

From d616c4013043da9a5944673a6e74ef061063604d Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 12 Sep 2023 09:14:59 +0200
Subject: [PATCH 142/349] Update changelog

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2c1cd1de..7943038a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-17 (1:17.0.0~+rc4-1~exp5) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.0~+rc4-1~exp5) experimental; urgency=medium
 
   * debian/patches/D158066.patch:
     - cherry-pick change from 1:16.0.6-11

From bdaf3c52bac44a9f4284e603b83e7257af24abbf Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 12 Sep 2023 19:32:39 +0200
Subject: [PATCH 143/349] Revert "Drop mips64el hack"

This reverts commit 63151625c2ac12f1d1b5705fbb2d48f227b4548d.
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 9a215574..a44eeee6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1217,7 +1217,7 @@ endif
 
 # Disable the python binding for buster. not sure why it regressed
 # regressed de4364f1ecaa..0745b0c0354a
-	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic"; then \
+	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \
 		mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \
 		touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
 		echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \

From 753379e0e06236751aed9a8b8ba475191220d234 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 12 Sep 2023 19:44:26 +0200
Subject: [PATCH 144/349] Upload

---
 debian/changelog      | 1 -
 debian/patches/series | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7943038a..33caad3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -124,7 +124,6 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
   * Second attempt to refresh D158066.patch (Closes: #1049362)
-  * Second attempt to fix mips64el without loosing ompd
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 11 Sep 2023 15:40:42 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 9aedc669..24c7fb9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,4 @@ force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
 D158066-simd-ppc64el.patch
-mips64el-ompt.patch
+#mips64el-ompt.patch

From 881afc1a01a64f9768345840ad9b251d65bd85d1 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 12 Sep 2023 19:57:53 +0200
Subject: [PATCH 145/349] Try to enable mips64el for experimental

---
 debian/changelog      | 6 ++++++
 debian/patches/series | 2 +-
 debian/rules          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 746272f9..9d892d5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-16 (1:16.0.6-15exp1) experimental; urgency=medium
+
+  * Try to build mips64el
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 12 Sep 2023 19:48:32 +0200
+
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
   * Second attempt to refresh D158066.patch (Closes: #1049362)
diff --git a/debian/patches/series b/debian/patches/series
index 60318593..71f6fc95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -153,4 +153,4 @@ ubuntu-releases.patch
 new-cmake-build-fix.patch
 HIP-search-path-fix.patch
 D158066-simd-ppc64el.patch
-#mips64el-ompt.patch
+mips64el-ompt.patch
diff --git a/debian/rules b/debian/rules
index 6cb1ab63..7d7c278f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1190,7 +1190,7 @@ endif
 
 # Disable the python binding for buster. not sure why it regressed
 # regressed de4364f1ecaa..0745b0c0354a
-	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \
+	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic"; then \
 		mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \
 		touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
 		echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \

From 9b6ff62b57ac17aebbc3b69e58c3c3c5557e3367 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 13 Sep 2023 11:52:14 +0200
Subject: [PATCH 146/349] Revert "Try to enable mips64el for experimental"

This reverts commit 881afc1a01a64f9768345840ad9b251d65bd85d1.
---
 debian/changelog      | 6 ------
 debian/patches/series | 2 +-
 debian/rules          | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d892d5a..746272f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-llvm-toolchain-16 (1:16.0.6-15exp1) experimental; urgency=medium
-
-  * Try to build mips64el
-
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 12 Sep 2023 19:48:32 +0200
-
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
   * Second attempt to refresh D158066.patch (Closes: #1049362)
diff --git a/debian/patches/series b/debian/patches/series
index 71f6fc95..60318593 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -153,4 +153,4 @@ ubuntu-releases.patch
 new-cmake-build-fix.patch
 HIP-search-path-fix.patch
 D158066-simd-ppc64el.patch
-mips64el-ompt.patch
+#mips64el-ompt.patch
diff --git a/debian/rules b/debian/rules
index 7d7c278f..6cb1ab63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1190,7 +1190,7 @@ endif
 
 # Disable the python binding for buster. not sure why it regressed
 # regressed de4364f1ecaa..0745b0c0354a
-	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic"; then \
+	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \
 		mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \
 		touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
 		echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \

From f595c837a2a6c681e328d02706d54136bf5816b0 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sat, 16 Sep 2023 10:39:01 +0200
Subject: [PATCH 147/349] Make libclang-common-16-dev arch:any (Closes:
 #1041455)

---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index bd8fbba0..2a17e73c 100644
--- a/debian/control
+++ b/debian/control
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-16.
 
 Package: libclang-common-16-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (>= ${source:Version}),
  libllvm16 (<< ${source:Version}.1~)
diff --git a/debian/control.in b/debian/control.in
index 6df959fa..c1862739 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (>= ${source:Version}),
  libllvm@LLVM_VERSION@ (<< ${source:Version}.1~)

From a20a6e46dcc91a341f326aabe80c118e213daf11 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sat, 16 Sep 2023 10:39:36 +0200
Subject: [PATCH 148/349] Update changelog

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 746272f9..99a89e3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
+
+  * Make libclang-common-16-dev arch:any (Closes: #1041455)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 16 Sep 2023 10:39:22 +0200
+
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
   * Second attempt to refresh D158066.patch (Closes: #1049362)

From 87eceb54e82cfc03276cf28e1108a1dc23feb7f8 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sat, 16 Sep 2023 10:44:44 +0200
Subject: [PATCH 149/349] Drop patch

---
 debian/patches/mips64el-ompt.patch | 10 ----------
 debian/patches/series              |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 debian/patches/mips64el-ompt.patch

diff --git a/debian/patches/mips64el-ompt.patch b/debian/patches/mips64el-ompt.patch
deleted file mode 100644
index 3e84a148..00000000
--- a/debian/patches/mips64el-ompt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- llvm-toolchain-16-16.0.6.orig/openmp/runtime/cmake/config-ix.cmake
-+++ llvm-toolchain-16-16.0.6/openmp/runtime/cmake/config-ix.cmake
-@@ -328,6 +329,7 @@ else()
-       (LIBOMP_ARCH STREQUAL aarch64) OR
-       (LIBOMP_ARCH STREQUAL aarch64_a64fx) OR
-       (LIBOMP_ARCH STREQUAL ppc64le) OR
-+      (LIBOMP_ARCH STREQUAL mips64) OR
-       (LIBOMP_ARCH STREQUAL ppc64) OR
-       (LIBOMP_ARCH STREQUAL riscv64) OR
-       (LIBOMP_ARCH STREQUAL loongarch64))
diff --git a/debian/patches/series b/debian/patches/series
index 24c7fb9e..bbd25f55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,4 +148,3 @@ force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
 D158066-simd-ppc64el.patch
-#mips64el-ompt.patch

From 97eeb1331c52527df116e45085a1d33983631759 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sat, 16 Sep 2023 10:44:57 +0200
Subject: [PATCH 150/349] Drop patch not fixing the mips64el issue

---
 debian/patches/mips64el-ompt.patch | 10 ----------
 debian/patches/series              |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 debian/patches/mips64el-ompt.patch

diff --git a/debian/patches/mips64el-ompt.patch b/debian/patches/mips64el-ompt.patch
deleted file mode 100644
index 3e84a148..00000000
--- a/debian/patches/mips64el-ompt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- llvm-toolchain-16-16.0.6.orig/openmp/runtime/cmake/config-ix.cmake
-+++ llvm-toolchain-16-16.0.6/openmp/runtime/cmake/config-ix.cmake
-@@ -328,6 +329,7 @@ else()
-       (LIBOMP_ARCH STREQUAL aarch64) OR
-       (LIBOMP_ARCH STREQUAL aarch64_a64fx) OR
-       (LIBOMP_ARCH STREQUAL ppc64le) OR
-+      (LIBOMP_ARCH STREQUAL mips64) OR
-       (LIBOMP_ARCH STREQUAL ppc64) OR
-       (LIBOMP_ARCH STREQUAL riscv64) OR
-       (LIBOMP_ARCH STREQUAL loongarch64))
diff --git a/debian/patches/series b/debian/patches/series
index 60318593..cf3bb85f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -153,4 +153,3 @@ ubuntu-releases.patch
 new-cmake-build-fix.patch
 HIP-search-path-fix.patch
 D158066-simd-ppc64el.patch
-#mips64el-ompt.patch

From 00539c4ad98338656aa766569c83eb7a31b94cd1 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 16 Sep 2023 11:04:56 +0200
Subject: [PATCH 151/349] improve the changelog

---
 debian/changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 99a89e3c..af08c7dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
 llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
 
   * Make libclang-common-16-dev arch:any (Closes: #1041455)
+    It was arch:all because all the code isn't arch dependant
+    However, it causes issues for cross build.
+    So, back to any
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 16 Sep 2023 10:39:22 +0200
 
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
   * Second attempt to refresh D158066.patch (Closes: #1049362)
+    (SIMD compatibility headers on ppc64el)
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 11 Sep 2023 15:40:42 +0200
 

From e52f15cba22bf4fda88f8c1d60c9f49fc4a43737 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 18 Sep 2023 11:23:17 +0200
Subject: [PATCH 152/349] Enable again python3-lldb on bionic (apt.llvm.org)

---
 debian/changelog | 6 ++++++
 debian/rules     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e4c4a3ee..8254500d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.0~+rc4-1~exp6) experimental; urgency=medium
+
+  * Enable again python3-lldb on bionic (apt.llvm.org)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 18 Sep 2023 11:22:37 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp5) experimental; urgency=medium
 
   * debian/patches/D158066.patch:
diff --git a/debian/rules b/debian/rules
index a44eeee6..7ed4e764 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1217,7 +1217,7 @@ endif
 
 # Disable the python binding for buster. not sure why it regressed
 # regressed de4364f1ecaa..0745b0c0354a
-	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \
+	if test "$(DISTRO)" = "buster" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \
 		mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \
 		touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
 		echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \

From 9af30d9926b6e93580262310fa652d19fcc15869 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 19 Sep 2023 12:06:51 +0200
Subject: [PATCH 153/349] Bring back old version of spirv - necessary for
 apt.llvm.org

---
 debian/changelog  | 6 +++++-
 debian/control    | 4 +++-
 debian/control.in | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af08c7dd..dcd3aee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
 
+  [ Gianfranco Costamagna ]
   * Make libclang-common-16-dev arch:any (Closes: #1041455)
     It was arch:all because all the code isn't arch dependant
     However, it causes issues for cross build.
     So, back to any
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 16 Sep 2023 10:39:22 +0200
+  [ Sylvestre Ledru ]
+  * Bring back old version of spirv - necessary for apt.llvm.org
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 12:04:45 +0200
 
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2a17e73c..39cdb359 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,9 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+    llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> |
+    llvm-spirv-15 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
+    llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,
diff --git a/debian/control.in b/debian/control.in
index c1862739..fefe1e5c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -23,7 +23,9 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+    llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> |
+    llvm-spirv-15 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
+    llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,

From 66df4dbb4794328bcbe708f729895e9ae6232ff1 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 19 Sep 2023 13:47:43 +0200
Subject: [PATCH 154/349] add some missing symbols

---
 debian/libclang1-X.Y.symbols.in | 1 +
 debian/libomp5-X.Y.symbols.in   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in
index fb48bedd..49724304 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Y.symbols.in
@@ -1,6 +1,7 @@
 libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER#
  (optional)LLVM_13@LLVM_13 1:15.0.7-3
  (optional)LLVM_16@LLVM_16 1:16.0.2-1
+ (optional)LLVM_17@LLVM_17 1:17.0.1-1
  clang_BlockCommandComment_getArgText@LLVM_13 1:5.0~svn298832-1~
  clang_BlockCommandComment_getCommandName@LLVM_13 1:5.0~svn298832-1~
  clang_BlockCommandComment_getNumArgs@LLVM_13 1:5.0~svn298832-1~
diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in
index 45daca66..13e614d3 100644
--- a/debian/libomp5-X.Y.symbols.in
+++ b/debian/libomp5-X.Y.symbols.in
@@ -1421,6 +1421,7 @@ libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
  __tgt_rtl_wait_event@VERS1.0 17
 libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
  VERS1.0@VERS1.0 17
+ __tgt_rtl_create_event@VERS1.0 1:17.0.1-1
  __tgt_rtl_data_alloc@VERS1.0 17
  __tgt_rtl_data_delete@VERS1.0 17
  __tgt_rtl_data_exchange@VERS1.0 17

From 6cea0970837cfd9a52dc7265247d542e5828db7f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 19 Sep 2023 14:41:35 +0200
Subject: [PATCH 155/349] allow hello on i386 to replace llvm spirv

---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 39cdb359..c8d42c5e 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
     llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> |
     llvm-spirv-15 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
-    llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+    llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello,
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,
diff --git a/debian/control.in b/debian/control.in
index fefe1e5c..10d26b66 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
     llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> |
     llvm-spirv-15 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
-    llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+    llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello,
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,

From 79c42ee484c4617d741ec48fd23eca3b10fed528 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 19 Sep 2023 10:42:51 +0200
Subject: [PATCH 156/349] New upstream release

---
 debian/changelog | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8254500d..07fc20b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.0-1~exp1) UNRELEASED; urgency=medium
+
+  * New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 10:42:01 +0200
+
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp6) experimental; urgency=medium
 
   * Enable again python3-lldb on bionic (apt.llvm.org)
@@ -47,7 +53,7 @@ llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium
   * new upstream release
   * Disable python3-lldb on mips64el to unbreak the build
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 05 Sep 2023 14:42:18 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 05 Sep 2023 14:30:50 +0200
 
 llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium
 
@@ -72,6 +78,12 @@ llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 15 Aug 2023 19:25:12 +0000
 
+llvm-toolchain-snapshot (1:17~++20230723074821+3ebe606592fb-1~exp1) UNRELEASED; urgency=medium
+
+  * experimental New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 23 Jul 2023 19:48:42 +0200
+
 llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental; urgency=medium
 
   * Install usr/lib/llvm-17/lib/clang/17/include/llvm_libc_wrappers/*.h

From 28bb79e385618fafcd96402ece0409729e8fc2e6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 20 Sep 2023 11:20:08 +0200
Subject: [PATCH 157/349] new upstream release

---
 debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 07fc20b1..27dd443a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-llvm-toolchain-17 (1:17.0.0-1~exp1) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.1-1~exp1) experimental; urgency=medium
 
-  * New snapshot release
+  * New upstream release
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 10:42:01 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 10:43:02 +0200
 
 llvm-toolchain-17 (1:17.0.0~+rc4-1~exp6) experimental; urgency=medium
 

From 39e07012b8b98fc3ecd09734557dcee384f370bc Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 20 Sep 2023 11:22:00 +0200
Subject: [PATCH 158/349]   So, back to any and
 libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})   instead of source

---
 debian/changelog  | 3 ++-
 debian/control    | 2 +-
 debian/control.in | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dcd3aee9..10a6fdba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
   * Make libclang-common-16-dev arch:any (Closes: #1041455)
     It was arch:all because all the code isn't arch dependant
     However, it causes issues for cross build.
-    So, back to any
+    So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
+    instead of source
 
   [ Sylvestre Ledru ]
   * Bring back old version of spirv - necessary for apt.llvm.org
diff --git a/debian/control b/debian/control
index c8d42c5e..f54f676b 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/16
 Package: clang-16
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-16-dev (= ${source:Version}),
+ ${dep:devlibs-objc}, libclang-common-16-dev (= ${binary:Version}),
  llvm-16-linker-tools (= ${binary:Version}),
  libclang1-16 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
diff --git a/debian/control.in b/debian/control.in
index 10d26b66..b672b0ee 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -45,7 +45,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_
 Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
+ ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
  libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler

From 40f8d9483782aca20e0ca84701310e77f0d22380 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 20 Sep 2023 11:23:19 +0200
Subject: [PATCH 159/349] Make libclang-common-16-dev arch:any (Closes:
 #1041455) It was arch:all because all the code isn't arch dependant However,
 it causes issues for cross build. So, back to any and
 libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}) instead of source
 (thanks to Gianfranco Costamagna too)

---
 debian/changelog  | 6 ++++++
 debian/control    | 2 +-
 debian/control.in | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27dd443a..84a191d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 llvm-toolchain-17 (1:17.0.1-1~exp1) experimental; urgency=medium
 
   * New upstream release
+  * Make libclang-common-16-dev arch:any (Closes: #1041455)
+    It was arch:all because all the code isn't arch dependant
+    However, it causes issues for cross build.
+    So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
+    instead of source
+    (thanks to Gianfranco Costamagna too)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 10:43:02 +0200
 
diff --git a/debian/control b/debian/control
index ad497374..ac173527 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17
 Package: clang-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-17-dev (= ${source:Version}),
+ ${dep:devlibs-objc}, libclang-common-17-dev (= ${binary:Version}),
  llvm-17-linker-tools (= ${binary:Version}),
  libclang1-17 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
diff --git a/debian/control.in b/debian/control.in
index c070c942..9be543d2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -43,7 +43,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_
 Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
+ ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
  libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler

From be7848d2b913aed131e347987fb9a416b66a9077 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 20 Sep 2023 23:11:03 +0200
Subject: [PATCH 160/349] Revert "Make libclang-common-16-dev arch:any (Closes:
 #1041455) It was arch:all because all the code isn't arch dependant However,
 it causes issues for cross build. So, back to any and
 libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}) instead of source
 (thanks to Gianfranco Costamagna too)"

This reverts commit 40f8d9483782aca20e0ca84701310e77f0d22380.
---
 debian/changelog  | 6 ------
 debian/control    | 4 ++--
 debian/control.in | 4 ++--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84a191d6..27dd443a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,6 @@
 llvm-toolchain-17 (1:17.0.1-1~exp1) experimental; urgency=medium
 
   * New upstream release
-  * Make libclang-common-16-dev arch:any (Closes: #1041455)
-    It was arch:all because all the code isn't arch dependant
-    However, it causes issues for cross build.
-    So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
-    instead of source
-    (thanks to Gianfranco Costamagna too)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 10:43:02 +0200
 
diff --git a/debian/control b/debian/control
index ac173527..ba78b466 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17
 Package: clang-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-17-dev (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang-common-17-dev (= ${source:Version}),
  llvm-17-linker-tools (= ${binary:Version}),
  libclang1-17 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-17.
 
 Package: libclang-common-17-dev
-Architecture: any
+Architecture: all
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (>= ${source:Version}),
  libllvm17 (<< ${source:Version}.1~)
diff --git a/debian/control.in b/debian/control.in
index 9be543d2..43f5aae9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -43,7 +43,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_
 Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
  libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: any
+Architecture: all
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (>= ${source:Version}),
  libllvm@LLVM_VERSION@ (<< ${source:Version}.1~)

From 1a630d8ab16a4ebc944a91bf355d062f195546eb Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Mon, 25 Sep 2023 15:00:15 +0200
Subject: [PATCH 161/349] Also remove omp from cmake file (Closes: #1052533)

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 7ed4e764..891b6620 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1169,7 +1169,7 @@ endif
 	sed -i '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}'  $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
 	sed -i '/_IMPORT_CHECK_FILES_FOR_.*\/bin\/.*/ {s|^|#|}'  $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
 	sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|Polly\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
-	sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
+	sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
 
 # Disable CMake's package validation checks for binaries that may not be installed
 	sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake

From 64ea2cdfe8f8db27907bafb722b9485cedc449ee Mon Sep 17 00:00:00 2001
From: Alexandre Detiste <alexandre.detiste@gmail.com>
Date: Thu, 28 Sep 2023 09:56:45 +0200
Subject: [PATCH 162/349] remove python3-six from now on

six usage has been removed upstream a long time ago already:

https://github.com/llvm/llvm-project/commit/5ed6d99a8311e54762df3d40dfb1d12578aaa4f5
---
 debian/control    | 4 ++--
 debian/control.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index f54f676b..cce40829 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libelf-dev,
     libffi-dev,
     lsb-release, patchutils, diffstat, xz-utils, python3-dev,
-    libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6),
+    libedit-dev, libncurses5-dev, swig, python3-sphinx (>= 1.3.6),
     binutils-dev,
     libxml2-dev,
     libjsoncpp-dev, pkg-config,
@@ -589,7 +589,7 @@ Package: python3-lldb-16
 Section: python
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-16 (= ${binary:Version}), python3-six
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-16 (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y
diff --git a/debian/control.in b/debian/control.in
index b672b0ee..0cd697cc 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libelf-dev,
     libffi-dev,
     lsb-release, patchutils, diffstat, xz-utils, python3-dev,
-    libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6),
+    libedit-dev, libncurses5-dev, swig, python3-sphinx (>= 1.3.6),
     binutils-dev,
     libxml2-dev,
     libjsoncpp-dev, pkg-config,
@@ -589,7 +589,7 @@ Package: python3-lldb-@LLVM_VERSION@
 Section: python
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version}), python3-six
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y

From 05694855ce9df1bcbc81508b647126a57e1c6e31 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 28 Sep 2023 09:57:36 +0200
Subject: [PATCH 163/349] Remove python-six as dep

---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 10a6fdba..a1ee23af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
   [ Sylvestre Ledru ]
   * Bring back old version of spirv - necessary for apt.llvm.org
 
+  [ Alexandre Detiste ]
+  * Remove python-six as dep
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 12:04:45 +0200
 
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium

From 625f312ad37cfc191199e4a53606151215037a99 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Thu, 28 Sep 2023 11:24:55 +0200
Subject: [PATCH 164/349] Upload to experimental

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 27dd443a..8963cfa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.1-1~exp2) experimental; urgency=medium
+
+  * Also remove omp from cmake file (Closes: #1052533)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 28 Sep 2023 11:24:39 +0200
+
 llvm-toolchain-17 (1:17.0.1-1~exp1) experimental; urgency=medium
 
   * New upstream release

From cbd9b875cc61dab2331095d1b1146433144ad648 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 30 Sep 2023 11:48:54 +0200
Subject: [PATCH 165/349] remove old doc files

---
 debian/llvm-X.Y-doc.install.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/debian/llvm-X.Y-doc.install.in b/debian/llvm-X.Y-doc.install.in
index a84b0423..aaafde92 100644
--- a/debian/llvm-X.Y-doc.install.in
+++ b/debian/llvm-X.Y-doc.install.in
@@ -1,6 +1 @@
 llvm/docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc.tar.gz
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/doxygen.css
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html

From fd5f9ea8f16d1c1e56434c6752cc9e68d35e476b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 30 Sep 2023 11:48:54 +0200
Subject: [PATCH 166/349] remove old doc files

---
 debian/llvm-X.Y-doc.install.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/debian/llvm-X.Y-doc.install.in b/debian/llvm-X.Y-doc.install.in
index a84b0423..aaafde92 100644
--- a/debian/llvm-X.Y-doc.install.in
+++ b/debian/llvm-X.Y-doc.install.in
@@ -1,6 +1 @@
 llvm/docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc.tar.gz
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/doxygen.css
-#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html

From 2e2adfa89b1ff57b7eccf08106fd64016971212c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 3 Oct 2023 09:19:38 +0200
Subject: [PATCH 167/349] New upstream release

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8963cfa5..3a74d2ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.2-1~exp1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 03 Oct 2023 09:18:45 +0200
+
 llvm-toolchain-17 (1:17.0.1-1~exp2) experimental; urgency=medium
 
   * Also remove omp from cmake file (Closes: #1052533)

From 4f4371844202df730d9c500a5f4251125cab2c99 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 4 Oct 2023 09:46:59 +0200
Subject: [PATCH 168/349] Consolidate the build flags for the wasm builds.

---
 debian/changelog | 7 +++++++
 debian/rules     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a74d2ac..1fb0c981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
+
+  [ Matthias Klose ]
+  * Consolidate the build flags for the wasm builds.
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 04 Oct 2023 09:46:49 +0200
+
 llvm-toolchain-17 (1:17.0.2-1~exp1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 891b6620..c536c257 100755
--- a/debian/rules
+++ b/debian/rules
@@ -821,8 +821,8 @@ endif
 	touch $@
 
 # Remove some new flags introduced by dpkg 1.22.0;
-STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g" -e "s/-mbranch-protection=standard//g")
-STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g" -e "s/-mbranch-protection=standard//g")
+STAGE_2_WASM_CFLAGS := $(filter-out -march=% -mfpu=% -fcf-protection% -mbranch-protection%, $(STAGE_2_CFLAGS))
+STAGE_2_WASM_CXXFLAGS := $(filter-out -march=% -mfpu=% -fcf-protection% -mbranch-protection%, $(STAGE_2_CXXFLAGS))
 
 build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%)
 build-wasm/compiler-rt-%:

From 0eff8a6b9ff7ac266f7f4dd0320b5738b8be67ef Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 8 Oct 2023 08:08:47 +0200
Subject: [PATCH 169/349]   * Disable the clc and wasm builds when not building
 binary indep packages.   * Limit the parallel links to 2 on riscv64.

---
 debian/changelog |  2 ++
 debian/rules     | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fb0c981..2adffe35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
 
   [ Matthias Klose ]
   * Consolidate the build flags for the wasm builds.
+  * Disable the clc and wasm builds when not building binary indep packages.
+  * Limit the parallel links to 2 on riscv64.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 04 Oct 2023 09:46:49 +0200
 
diff --git a/debian/rules b/debian/rules
index c536c257..f4b06101 100755
--- a/debian/rules
+++ b/debian/rules
@@ -195,6 +195,7 @@ endif
 # debug symbols OOM in Ubuntu Ubuntu and slows down build process.
 ifneq (,$(filter $(DEB_HOST_ARCH),riscv64))
   opt_flags = -O2 -DNDEBUG -g0
+  STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=2
 else
   opt_flags = -O2 -DNDEBUG -g1
 endif
@@ -960,8 +961,8 @@ sccache-stats:
 override_dh_auto_build: \
   debian-full-build \
   debian-libfuzzer-build \
-  debian-libclc-build \
-  debian-wasm-build \
+  $(if $(filter libclc-%, $(shell dh_listpackages)),debian-libclc-build) \
+  $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),debian-wasm-build) \
   sccache-stats
 
 override_dh_prep: build_doc
@@ -1112,10 +1113,16 @@ endif
 	# Remove an osx file
 	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libbolt_rt_instr_osx.a
 
-	DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install
+	if test -d libclc/build; then \
+		DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install; \
+	fi
 
-	DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install
-	DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install
+	if test -d build-wasm/compiler-rt-wasm32; then \
+		DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install; \
+	fi
+	if test -d build-wasm/compiler-rt-wasm64; then \
+		DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install; \
+	fi
 	if test -d build-wasm/libcxx-wasm32-wasi; then \
 		DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/libcxx-wasm32-wasi install; \
 	fi

From cf394ad05221f59830df54a18afe0dde554172be Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 8 Oct 2023 08:30:54 +0200
Subject: [PATCH 170/349]   * d/rules: Be less noisy when building without
 grpc.

---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2adffe35..529765c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
   * Consolidate the build flags for the wasm builds.
   * Disable the clc and wasm builds when not building binary indep packages.
   * Limit the parallel links to 2 on riscv64.
+  * d/rules: Be less noisy when building without grpc.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 04 Oct 2023 09:46:49 +0200
 
diff --git a/debian/rules b/debian/rules
index f4b06101..0ffeb728 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,7 +136,7 @@ STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH)
 # clangd remote index support requires GRPC & protobuf.
 # Enable if minimum tested versions are available.
 CLANGD_GRPC_INSTALLED=no
-ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libgrpc++-dev) gt 1.30.0; echo $$?),0)
+ifeq ($(shell v=$$(dpkg-query -W -f '$${Version}' libgrpc++-dev 2>/dev/null); if [ -z "$$v" ]; then echo 1; else dpkg --compare-versions $$v gt 1.30.0; echo $$?; fi),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler-grpc) gt 1.30.0; echo $$?),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libprotobuf-dev) gt 3.12.0; echo $$?),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler) gt 3.12.0; echo $$?),0)

From 9cd9288bdf751a5f4c7a4da24309c64adfbe9d17 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 8 Oct 2023 08:59:32 +0200
Subject: [PATCH 171/349]   * Build-depend on libncurses-dev instead of
 libncurses5-dev.

---
 debian/changelog  | 1 +
 debian/control    | 2 +-
 debian/control.in | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 529765c3..d20f3391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
   * Disable the clc and wasm builds when not building binary indep packages.
   * Limit the parallel links to 2 on riscv64.
   * d/rules: Be less noisy when building without grpc.
+  * Build-depend on libncurses-dev instead of libncurses5-dev.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 04 Oct 2023 09:46:49 +0200
 
diff --git a/debian/control b/debian/control
index ba78b466..b41d2e9b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libelf-dev,
     libffi-dev,
     lsb-release, patchutils, diffstat, xz-utils, python3-dev,
-    libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6),
+    libedit-dev, libncurses-dev, swig, python3-six, python3-sphinx (>= 1.3.6),
     binutils-dev,
     libxml2-dev,
     libjsoncpp-dev, pkg-config,
diff --git a/debian/control.in b/debian/control.in
index 43f5aae9..5bd27e2f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libelf-dev,
     libffi-dev,
     lsb-release, patchutils, diffstat, xz-utils, python3-dev,
-    libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6),
+    libedit-dev, libncurses-dev, swig, python3-six, python3-sphinx (>= 1.3.6),
     binutils-dev,
     libxml2-dev,
     libjsoncpp-dev, pkg-config,

From b3a840b6de027f3d78cb11d8b3cbe9cb15b82d38 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 8 Oct 2023 09:12:57 +0200
Subject: [PATCH 172/349] Add support for loongarch64

---
 debian/changelog                  |   5 +-
 debian/clang-tools-X.Y.install.in |   2 +-
 debian/control                    |  24 +-
 debian/control.in                 |  24 +-
 debian/libomp-X.Y-dev.install.in  |  12 +-
 debian/libomp5-X.Y.install.in     |   2 +-
 debian/libomp5-X.Y.symbols.in     | 526 +++++++++++++++---------------
 7 files changed, 299 insertions(+), 296 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1ee23af..5a7be1a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,10 @@ llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
   [ Alexandre Detiste ]
   * Remove python-six as dep
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 12:04:45 +0200
+  [ Li Chen ]
+  * Add support for loongarch64 (Closes: #1053658)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 08 Oct 2023 09:11:38 +0200
 
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in
index 6a0d0c4c..3002792a 100644
--- a/debian/clang-tools-X.Y.install.in
+++ b/debian/clang-tools-X.Y.install.in
@@ -61,7 +61,7 @@ usr/lib/llvm-@LLVM_VERSION@/libexec/analyze-cc
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc
 
-[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
+[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64 !loong64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
 
 clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 clang/tools/scan-view-@LLVM_VERSION@       usr/share/clang/
diff --git a/debian/control b/debian/control
index cce40829..5abd8387 100644
--- a/debian/control
+++ b/debian/control
@@ -522,7 +522,7 @@ Description: Modular compiler and toolchain technologies, examples
 # ------------- lld -------------
 
 Package: lld-16
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -532,7 +532,7 @@ Description: LLVM-based linker
  Project.
 
 Package: liblld-16
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -546,7 +546,7 @@ Description: LLVM-based linker, library
 
 Package: liblld-16-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lld-16 (= ${binary:Version}),
  liblld-16 (= ${binary:Version}), libzstd-dev, zlib1g-dev
@@ -562,7 +562,7 @@ Description: LLVM-based linker, header files
 # ------------- lldb -------------
 
 Package: lldb-16
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version}),
  python3-lldb-16
@@ -573,7 +573,7 @@ Description: Next generation, high-performance debugger
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-16
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -587,7 +587,7 @@ Description: Next generation, high-performance debugger, library
 
 Package: python3-lldb-16
 Section: python
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-16 (= ${binary:Version})
 Conflicts: python3-lldb-x.y
@@ -603,7 +603,7 @@ Description: Next generation, high-performance debugger, python3 lib
 
 Package: liblldb-16-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-16 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -621,7 +621,7 @@ Description: Next generation, high-performance debugger, header files
 
 Package: libomp-16-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: libomp5-16 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-16-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
@@ -635,7 +635,7 @@ Description: LLVM OpenMP runtime - dev package
 
 Package: libomp5-16
 Multi-Arch: same
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: libomp5 (<< 44)
 Provides: libomp-x.y
@@ -690,7 +690,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends},
- libunwind-16-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
+ libunwind-16-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -830,7 +830,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-16
 Section: libs
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -847,7 +847,7 @@ Description: production-quality unwinder
 
 Package: libunwind-16-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
diff --git a/debian/control.in b/debian/control.in
index 0cd697cc..3505c06d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -522,7 +522,7 @@ Description: Modular compiler and toolchain technologies, examples
 # ------------- lld -------------
 
 Package: lld-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -532,7 +532,7 @@ Description: LLVM-based linker
  Project.
 
 Package: liblld-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -546,7 +546,7 @@ Description: LLVM-based linker, library
 
 Package: liblld-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lld-@LLVM_VERSION@ (= ${binary:Version}),
  liblld-@LLVM_VERSION@ (= ${binary:Version}), libzstd-dev, zlib1g-dev
@@ -562,7 +562,7 @@ Description: LLVM-based linker, header files
 # ------------- lldb -------------
 
 Package: lldb-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}),
  python3-lldb-@LLVM_VERSION@
@@ -573,7 +573,7 @@ Description: Next generation, high-performance debugger
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -587,7 +587,7 @@ Description: Next generation, high-performance debugger, library
 
 Package: python3-lldb-@LLVM_VERSION@
 Section: python
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version})
 Conflicts: python3-lldb-x.y
@@ -603,7 +603,7 @@ Description: Next generation, high-performance debugger, python3 lib
 
 Package: liblldb-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -621,7 +621,7 @@ Description: Next generation, high-performance debugger, header files
 
 Package: libomp-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: libomp5-@LLVM_VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-@LLVM_VERSION@-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
@@ -635,7 +635,7 @@ Description: LLVM OpenMP runtime - dev package
 
 Package: libomp5-@LLVM_VERSION@
 Multi-Arch: same
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: libomp5 (<< 44)
 Provides: libomp-x.y
@@ -690,7 +690,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends},
- libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
+ libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -830,7 +830,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-@LLVM_VERSION@
 Section: libs
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -847,7 +847,7 @@ Description: production-quality unwinder
 
 Package: libunwind-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in
index 081d2c52..ff72a7d7 100644
--- a/debian/libomp-X.Y-dev.install.in
+++ b/debian/libomp-X.Y-dev.install.in
@@ -7,16 +7,16 @@
 [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a
 [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so
 
-[amd64 ppc64el arm64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a
+[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a
 
-[amd64 ppc64el arm64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc
+[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc
 
 usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake
 
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay
+[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info
+[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay
 
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
+[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@
+[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
 
 [!armhf] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/
diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Y.install.in
index eea9615b..8204faac 100644
--- a/debian/libomp5-X.Y.install.in
+++ b/debian/libomp5-X.Y.install.in
@@ -1,4 +1,4 @@
 #!/usr/bin/dh-exec
 
 usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@
+[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@
diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in
index a9b00734..15295c9f 100644
--- a/debian/libomp5-X.Y.symbols.in
+++ b/debian/libomp5-X.Y.symbols.in
@@ -298,36 +298,36 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmp_wait_64@VERSION 0.20140926
  __kmpc_aligned_alloc@VERSION 14
  __kmpc_alloc@VERSION 8
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_10@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_10@VERSION 0.20130412
  __kmpc_atomic_16@VERSION 0.20130412
  __kmpc_atomic_1@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_20@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_20@VERSION 0.20130412
  __kmpc_atomic_2@VERSION 0.20130412
  __kmpc_atomic_32@VERSION 0.20130412
  __kmpc_atomic_4@VERSION 0.20130412
  __kmpc_atomic_8@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_1_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_1_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_2_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_2_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_4_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_4_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_8_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_8_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_add@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_1_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_1_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_2_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_2_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_4_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_4_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_8_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_8_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_add_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_mul@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_mul_cpt@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_rd@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_wr@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_cmplx16_add@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_add_cpt@VERSION 0.20130412
@@ -350,8 +350,8 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_cmplx4_div@VERSION 0.20130412
  __kmpc_atomic_cmplx4_div_cmplx8@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_div_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_div_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_div_rev@VERSION 0.20130412
  __kmpc_atomic_cmplx4_mul@VERSION 0.20130412
  __kmpc_atomic_cmplx4_mul_cmplx8@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_mul_cpt@VERSION 0.20130412
@@ -359,43 +359,43 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_cmplx4_sub@VERSION 0.20130412
  __kmpc_atomic_cmplx4_sub_cmplx8@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_sub_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_sub_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_sub_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_wr@VERSION 0.20130412
  __kmpc_atomic_cmplx8_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_add_cpt@VERSION 0.20130412
  __kmpc_atomic_cmplx8_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_div_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_div_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_div_rev@VERSION 0.20130412
  __kmpc_atomic_cmplx8_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_mul_cpt@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_rd@VERSION 0.20130412
  __kmpc_atomic_cmplx8_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_sub_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_sub_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_sub_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_wr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_end@VERSION 0.20130412
  (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed1_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_add_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_add_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed1_add_fp@VERSION 0.20130412
  __kmpc_atomic_fixed1_andb@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_andb_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed1_andl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_andl_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed1_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed1_div_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed1_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_div_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed1_eqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_eqv_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed1_max@VERSION 0.20130412
@@ -404,9 +404,9 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_min_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed1_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_mul_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_mul_cpt_fp@VERSION 4.0
  __kmpc_atomic_fixed1_mul_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_mul_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed1_mul_fp@VERSION 0.20130412
  __kmpc_atomic_fixed1_neqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_neqv_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed1_orb@VERSION 0.20130412
@@ -416,61 +416,61 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_rd@VERSION 0.20130412
  __kmpc_atomic_fixed1_shl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shl_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shl_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shl_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shl_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shl_rev@VERSION 0.20130412
  __kmpc_atomic_fixed1_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shr_rev@VERSION 0.20130412
  __kmpc_atomic_fixed1_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_swp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_sub_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_sub_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed1_sub_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_sub_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_sub_rev_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_wr@VERSION 0.20130412
  __kmpc_atomic_fixed1_xor@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_xor_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_add_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1u_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed1u_add_fp@VERSION 4.0
  __kmpc_atomic_fixed1u_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1u_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_mul_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_mul_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1u_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1u_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed1u_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1u_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1u_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed1u_mul_fp@VERSION 4.0
  __kmpc_atomic_fixed1u_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_sub_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_sub_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed1u_sub_rev_fp@VERSION 5.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_shr_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1u_sub_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1u_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed1u_sub_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64 !loong64)__kmpc_atomic_fixed1u_sub_rev_fp@VERSION 5.0
  __kmpc_atomic_fixed2_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_add_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_add_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed2_add_fp@VERSION 0.20130412
  __kmpc_atomic_fixed2_andb@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_andb_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed2_andl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_andl_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed2_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed2_div_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed2_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_div_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed2_eqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_eqv_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed2_max@VERSION 0.20130412
@@ -479,9 +479,9 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_min_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed2_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_mul_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_mul_cpt_fp@VERSION 4.0
  __kmpc_atomic_fixed2_mul_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_mul_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed2_mul_fp@VERSION 0.20130412
  __kmpc_atomic_fixed2_neqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_neqv_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed2_orb@VERSION 0.20130412
@@ -491,61 +491,61 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_rd@VERSION 0.20130412
  __kmpc_atomic_fixed2_shl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shl_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shl_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shl_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shl_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shl_rev@VERSION 0.20130412
  __kmpc_atomic_fixed2_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shr_rev@VERSION 0.20130412
  __kmpc_atomic_fixed2_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_swp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_sub_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_sub_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed2_sub_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_sub_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_sub_rev_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_wr@VERSION 0.20130412
  __kmpc_atomic_fixed2_xor@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_xor_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_add_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2u_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed2u_add_fp@VERSION 4.0
  __kmpc_atomic_fixed2u_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2u_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_mul_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_mul_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2u_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2u_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed2u_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2u_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2u_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed2u_mul_fp@VERSION 4.0
  __kmpc_atomic_fixed2u_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_sub_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_sub_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed2u_sub_rev_fp@VERSION 5.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_shr_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2u_sub_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2u_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed2u_sub_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64 !loong64)__kmpc_atomic_fixed2u_sub_rev_fp@VERSION 5.0
  __kmpc_atomic_fixed4_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_add_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_add_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed4_add_fp@VERSION 0.20130412
  __kmpc_atomic_fixed4_andb@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_andb_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed4_andl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_andl_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed4_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed4_div_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed4_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_div_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed4_eqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_eqv_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed4_max@VERSION 0.20130412
@@ -554,9 +554,9 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_min_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed4_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_mul_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_mul_cpt_fp@VERSION 4.0
  __kmpc_atomic_fixed4_mul_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_mul_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed4_mul_fp@VERSION 0.20130412
  __kmpc_atomic_fixed4_neqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_neqv_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed4_orb@VERSION 0.20130412
@@ -566,61 +566,61 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_rd@VERSION 0.20130412
  __kmpc_atomic_fixed4_shl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shl_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shl_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shl_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shl_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shl_rev@VERSION 0.20130412
  __kmpc_atomic_fixed4_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shr_rev@VERSION 0.20130412
  __kmpc_atomic_fixed4_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_swp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_sub_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_sub_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed4_sub_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_sub_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_sub_rev_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_wr@VERSION 0.20130412
  __kmpc_atomic_fixed4_xor@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_xor_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_add_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4u_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed4u_add_fp@VERSION 4.0
  (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed4u_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4u_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_mul_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_mul_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4u_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4u_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed4u_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4u_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4u_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed4u_mul_fp@VERSION 4.0
  __kmpc_atomic_fixed4u_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_sub_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_sub_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed4u_sub_rev_fp@VERSION 5.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_shr_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4u_sub_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4u_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed4u_sub_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64 !loong64)__kmpc_atomic_fixed4u_sub_rev_fp@VERSION 5.0
  (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed8_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_add_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_add_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed8_add_fp@VERSION 0.20130412
  __kmpc_atomic_fixed8_andb@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_andb_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed8_andl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_andl_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed8_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed8_div_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed8_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_div_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed8_eqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_eqv_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed8_max@VERSION 0.20130412
@@ -629,9 +629,9 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_min_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed8_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_mul_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_mul_cpt_fp@VERSION 4.0
  __kmpc_atomic_fixed8_mul_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_mul_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed8_mul_fp@VERSION 0.20130412
  __kmpc_atomic_fixed8_neqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_neqv_cpt@VERSION 0.20130412
  __kmpc_atomic_fixed8_orb@VERSION 0.20130412
@@ -641,169 +641,169 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_rd@VERSION 0.20130412
  __kmpc_atomic_fixed8_shl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shl_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shl_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shl_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shl_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shl_rev@VERSION 0.20130412
  __kmpc_atomic_fixed8_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shr_rev@VERSION 0.20130412
  __kmpc_atomic_fixed8_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_swp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_sub_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_sub_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed8_sub_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_sub_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_sub_rev_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_wr@VERSION 0.20130412
  __kmpc_atomic_fixed8_xor@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_xor_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_add_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8u_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed8u_add_fp@VERSION 4.0
  __kmpc_atomic_fixed8u_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8u_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_mul_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_mul_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8u_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8u_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed8u_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8u_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8u_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed8u_mul_fp@VERSION 4.0
  __kmpc_atomic_fixed8u_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_sub_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_sub_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed8u_sub_rev_fp@VERSION 5.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_add@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_shr_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8u_sub_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8u_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed8u_sub_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64 !loong64)__kmpc_atomic_fixed8u_sub_rev_fp@VERSION 5.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_add_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_add_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float10_add_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_max@VERSION 14
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float10_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_div_rev_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_max@VERSION 14
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_max_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_min@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_min@VERSION 14
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_min_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_mul@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_mul_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_mul_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_mul_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float10_mul_fp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_rd@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_swp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_sub_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float10_sub_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_sub_rev_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_wr@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_add@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_add_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_div@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_max@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_max_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_min@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_min_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_mul@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_mul_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_rd@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_sub@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_sub_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_sub_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_sub_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_swp@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_wr@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_add@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_add_cpt@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_div@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_div_cpt@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_max@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_max_cpt@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_min@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_min_cpt@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_mul@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_mul_cpt@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_rd@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_sub@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_sub_cpt@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_sub_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_sub_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_swp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_wr@VERSION 0.20130412
  __kmpc_atomic_float4_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_add_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_add_cpt_fp@VERSION 4.0
  (arch=!ppc64 !ppc64el)__kmpc_atomic_float4_add_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_add_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float4_add_fp@VERSION 0.20130412
  __kmpc_atomic_float4_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_float4_div_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float4_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_div_rev_fp@VERSION 4.0
  __kmpc_atomic_float4_max@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_max_cpt@VERSION 0.20130412
  __kmpc_atomic_float4_min@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_min_cpt@VERSION 0.20130412
  __kmpc_atomic_float4_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_mul_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_mul_cpt_fp@VERSION 4.0
  __kmpc_atomic_float4_mul_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_mul_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float4_mul_fp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_rd@VERSION 0.20130412
  __kmpc_atomic_float4_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_sub_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_sub_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_sub_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_float4_sub_float8@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_swp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float4_sub_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_sub_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_sub_rev_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_wr@VERSION 0.20130412
  __kmpc_atomic_float8_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_add_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_add_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_add_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_add_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float8_add_fp@VERSION 0.20130412
  __kmpc_atomic_float8_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_div_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_div_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_div_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float8_div_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_div_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_div_rev_fp@VERSION 4.0
  __kmpc_atomic_float8_max@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_max_cpt@VERSION 0.20130412
  __kmpc_atomic_float8_min@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_min_cpt@VERSION 0.20130412
  __kmpc_atomic_float8_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_mul_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_mul_cpt_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_mul_fp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_mul_cpt_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float8_mul_fp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_rd@VERSION 0.20130412
  __kmpc_atomic_float8_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_cpt@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_cpt_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_cpt_rev_fp@VERSION 4.0
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_rev@VERSION 0.20130412
-#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_swp@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_sub_cpt_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_sub_cpt_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_sub_cpt_rev_fp@VERSION 4.0
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float8_sub_fp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_sub_rev@VERSION 0.20130412
+#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_sub_rev_fp@VERSION 4.0
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_wr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_start@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_1_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_1_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_2_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_2_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_4_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_4_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_8_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_8_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_1_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_1_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_2_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_2_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_4_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_4_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_8_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_8_cas_cpt@VERSION 14
  __kmpc_barrier@VERSION 0.20130412
  __kmpc_barrier_master@VERSION 0.20130412
  __kmpc_barrier_master_nowait@VERSION 0.20130412
@@ -1027,7 +1027,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  kmpc_set_stacksize@VERSION 0.20130412
  kmpc_set_stacksize_s@VERSION 0.20130412
  kmpc_unset_affinity_mask_proc@VERSION 0.20130412
-#MISSING: 14# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)libomp_start_tool@VERSION 14
+#MISSING: 14# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)libomp_start_tool@VERSION 14
  omp_aligned_alloc@VERSION 14
  omp_aligned_calloc@VERSION 14
  omp_alloc@VERSION 8
@@ -1305,7 +1305,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  omp_set_schedule_@VERSION 0.20130412
  omp_set_teams_thread_limit@VERSION 13
  omp_set_teams_thread_limit_@VERSION 13
-#MISSING: 8# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)omp_state_info@VERSION 6.0
+#MISSING: 8# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)omp_state_info@VERSION 6.0
  omp_test_lock@OMP_1.0 0.20131209
  omp_test_lock@OMP_3.0 0.20131209
  omp_test_lock@VERSION 0.20130412

From 819087950a297f9e26f40f72e048021c202c7886 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 8 Oct 2023 10:34:16 +0200
Subject: [PATCH 173/349]   * Disable the clc and wasm builds when not building
 binary indep packages.   * Limit the parallel links to 2 on riscv64.

---
 debian/changelog |  8 ++++++--
 debian/rules     | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1ee23af..8851569e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-16ubuntu1) UNRELEASED; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Make libclang-common-16-dev arch:any (Closes: #1041455)
@@ -13,7 +13,11 @@ llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
   [ Alexandre Detiste ]
   * Remove python-six as dep
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 12:04:45 +0200
+  [ Matthias Klose ]
+  * Disable the clc and wasm builds when not building binary indep packages.
+  * Limit the parallel links to 2 on riscv64.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 08 Oct 2023 10:32:56 +0200
 
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 6cb1ab63..88cb1fb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -195,6 +195,7 @@ endif
 # debug symbols OOM in Ubuntu Ubuntu and slows down build process.
 ifneq (,$(filter $(DEB_HOST_ARCH),riscv64))
   opt_flags = -O2 -DNDEBUG -g0
+  STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=2
 else
   opt_flags = -O2 -DNDEBUG -g1
 endif
@@ -933,8 +934,8 @@ sccache-stats:
 override_dh_auto_build: \
   debian-full-build \
   debian-libfuzzer-build \
-  debian-libclc-build \
-  debian-wasm-build \
+  $(if $(filter libclc-%, $(shell dh_listpackages)),debian-libclc-build) \
+  $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),debian-wasm-build) \
   sccache-stats
 
 override_dh_prep: build_doc
@@ -1085,10 +1086,16 @@ endif
 	# Remove an osx file
 	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libbolt_rt_instr_osx.a
 
-	DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install
+	if test -d libclc/build; then \
+		DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install; \
+	fi
 
-	DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install
-	DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install
+	if test -d build-wasm/compiler-rt-wasm32; then \
+		DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install; \
+	fi
+	if test -d build-wasm/compiler-rt-wasm64; then \
+		DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install; \
+	fi
 	if test -d build-wasm/libcxx-wasm32-wasi; then \
 		DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/libcxx-wasm32-wasi install; \
 	fi

From e76e0fd6bce52e1246aec9ae6d2fcf11f362affa Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 8 Oct 2023 10:36:58 +0200
Subject: [PATCH 174/349]   * d/rules: Be less noisy when building without
 grpc.

---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 70b375e5..c42b55b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ llvm-toolchain-16 (1:16.0.6-16ubuntu1) UNRELEASED; urgency=medium
   [ Matthias Klose ]
   * Disable the clc and wasm builds when not building binary indep packages.
   * Limit the parallel links to 2 on riscv64.
+  * d/rules: Be less noisy when building without grpc.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 08 Oct 2023 09:11:38 +0200
 
diff --git a/debian/rules b/debian/rules
index 88cb1fb2..60fa1d20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,7 +136,7 @@ STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH)
 # clangd remote index support requires GRPC & protobuf.
 # Enable if minimum tested versions are available.
 CLANGD_GRPC_INSTALLED=no
-ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libgrpc++-dev) gt 1.30.0; echo $$?),0)
+ifeq ($(shell v=$$(dpkg-query -W -f '$${Version}' libgrpc++-dev 2>/dev/null); if [ -z "$$v" ]; then echo 1; else dpkg --compare-versions $$v gt 1.30.0; echo $$?; fi),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler-grpc) gt 1.30.0; echo $$?),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libprotobuf-dev) gt 3.12.0; echo $$?),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler) gt 3.12.0; echo $$?),0)

From 1b57c8feae2ac687692e8875328bcc512cce78de Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 8 Oct 2023 11:39:56 +0200
Subject: [PATCH 175/349] fix version

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c42b55b4..318bfcdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-16 (1:16.0.6-16ubuntu1) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Make libclang-common-16-dev arch:any (Closes: #1041455)

From 32d4389ffe3dc6046d513e42dda92461b1865f80 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 8 Oct 2023 11:43:17 +0200
Subject: [PATCH 176/349]   * Use a stamps subdirectory for all build stamps.

---
 debian/changelog |  1 +
 debian/rules     | 43 +++++++++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d20f3391..5ae0740b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
   * Limit the parallel links to 2 on riscv64.
   * d/rules: Be less noisy when building without grpc.
   * Build-depend on libncurses-dev instead of libncurses5-dev.
+  * Use a stamps subdirectory for all build stamps.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 04 Oct 2023 09:46:49 +0200
 
diff --git a/debian/rules b/debian/rules
index 0ffeb728..38657344 100755
--- a/debian/rules
+++ b/debian/rules
@@ -525,7 +525,7 @@ ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clan
 PROJECTS_LIST := $(shell echo "$(PROJECTS)"|sed -e "s| ||g")
 RUNTIMES_LIST := $(shell echo "$(RUNTIMES)"|sed -e "s| ||g")
 
-preconfigure:
+stamps/preconfigure:
 	if ! grep -qs '/proc ' /proc/mounts; then \
 		echo "/proc needs to be mounted"; \
 		exit 1; \
@@ -608,13 +608,16 @@ endif
 		dh_listpackages; \
 		exit 1; \
 	fi
+	@mkdir -p stamps
+	touch $@
 
 # Override this two targets. They are trying to manage the .in conversion for me
 override_dh_ocamlinit:
 override_dh_ocamlclean:
 override_dh_ocaml:
 
-override_dh_auto_configure: preconfigure
+override_dh_auto_configure: stamps/configure
+stamps/configure: stamps/preconfigure
 ifeq (${SCCACHE_ENABLE},yes)
 	ls -al $(SCCACHE_PATH)*
 endif
@@ -754,10 +757,12 @@ endif
 		echo "mismatch of version. Found: $$FOUND_VERSION / Expected: $(LLVM_VERSION_FULL)"; \
 		exit 1; \
 	fi
+	@mkdir -p stamps
+	touch $@
 
 VERBOSE=-v
 
-debian-full-build:
+stamps/debian-full-build:
 	echo "Using cmake: $(CMAKE_BIN)"
 # linker hack so stage2 can link against stage1 libs at runtime
 	LD_LIBRARY_PATH=$(STAGE_1_LIB_DIR):$$LD_LIBRARY_PATH \
@@ -780,7 +785,7 @@ debian-full-build:
 	fi
 	touch $@
 
-debian-libfuzzer-build:
+stamps/debian-libfuzzer-build:
 ifeq (${LIBFUZZER_ENABLE},yes)
 	cd $(TARGET_BUILD); \
 	CFLAGS="$(opt_flags) $(STAGE_2_CFLAGS)"; \
@@ -792,7 +797,7 @@ ifeq (${LIBFUZZER_ENABLE},yes)
 endif
 	touch $@
 
-debian-libclc-build:
+stamps/debian-libclc-build:
 # workaround missing files on i386
 	cd $(TARGET_BUILD_STAGE2) && ninja opt llvm-link llvm-as
 # Builds libclc
@@ -942,13 +947,13 @@ endif
 
 # Build compiler-rt for wasm32 and wasm64. Build libcxx only for wasm32, as
 # libcxx requires wasi-libc, which only exists for wasm32 right now.
-debian-wasm-build: \
+stamps/debian-wasm-build: \
   build-wasm/compiler-rt-wasm32 \
   build-wasm/libcxx-wasm32-wasi \
   build-wasm/compiler-rt-wasm64
 	touch $@
 
-sccache-stats:
+stamps/sccache-stats:
 # If we used sccache, shows stats
 	if test -f $(SCCACHE_CMD); then \
 		ls -al $(SCCACHE_PATH)/; \
@@ -959,16 +964,16 @@ sccache-stats:
 	touch $@
 
 override_dh_auto_build: \
-  debian-full-build \
-  debian-libfuzzer-build \
-  $(if $(filter libclc-%, $(shell dh_listpackages)),debian-libclc-build) \
-  $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),debian-wasm-build) \
-  sccache-stats
+  stamps/debian-full-build \
+  stamps/debian-libfuzzer-build \
+  $(if $(filter libclc-%, $(shell dh_listpackages)),stamps/debian-libclc-build) \
+  $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),stamps/debian-wasm-build) \
+  stamps/sccache-stats
 
-override_dh_prep: build_doc
+override_dh_prep: stamps/build_doc
 	dh_prep
 
-build_doc:
+stamps/build_doc:
 	BUILDDIR="_build"; \
 	ALLSPHINXOPTS="-d $$BUILDDIR/doctrees ."; \
 	cd $(CURDIR)/llvm/docs && \
@@ -1236,6 +1241,7 @@ endif
 # Delete the target build directory to save some space on the build systems
 # All the files have been installed in $(CURDIR)/debian/tmp/ already
 	rm -rf $(TARGET_BUILD)
+# FIXME: why a stamp for dh_override_install ?
 	touch $@
 
 
@@ -1323,7 +1329,7 @@ endif
 # So, we remove this directory from the package
 	rm -fr $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/wasi/
 
-repack_a_llvm_ir:
+stamps/repack_a_llvm_ir:
 ifeq (${LTO_ENABLE},yes)
 # with LTO, .a contains llvm ir instead of native code. So, recompile them
 	NJOBS="$(NJOBS)" P_TO_LLVM="$(CURDIR)" VERSION=$(LLVM_VERSION) bash -v debian/llvm-compile-lto-elf.sh $(CXXFLAGS_EXTRA)
@@ -1331,7 +1337,7 @@ endif
 	touch $@
 
 
-override_dh_installdeb: repack_a_llvm_ir
+override_dh_installdeb: stamps/repack_a_llvm_ir
 # Managed by the package
 	dh_installdeb -a
 
@@ -1434,7 +1440,7 @@ override_dh_auto_test:
 endif
 
 
-override_dh_gencontrol: sccache-stats
+override_dh_gencontrol: stamps/sccache-stats
 	dh_gencontrol -- $(control_vars)
 
 
@@ -1466,6 +1472,7 @@ override_dh_auto_clean:
 	: # for some reason, the docs are written to debian/usr and debian/man ...
 	rm -rf debian/usr debian/man
 	: # remove extra stamps
-	rm -f debian-*-build override_dh_auto_install sccache-stats build_doc
+	rm -f override_dh_auto_install
+	rm -rf stamps
 
 .PHONY: override_dh_strip preconfigure

From 781a5963ec421bf27232607313c4fc0e23e1b936 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 8 Oct 2023 12:14:20 +0200
Subject: [PATCH 177/349]   * Factor-out the calls to dh_listpackages.

---
 debian/changelog |  1 +
 debian/rules     | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ae0740b..81d70bd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
   * d/rules: Be less noisy when building without grpc.
   * Build-depend on libncurses-dev instead of libncurses5-dev.
   * Use a stamps subdirectory for all build stamps.
+  * Factor-out the calls to dh_listpackages.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 04 Oct 2023 09:46:49 +0200
 
diff --git a/debian/rules b/debian/rules
index 38657344..fe2f03a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,10 @@ DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
 
 include /usr/share/dpkg/architecture.mk
 
+# this contains all packages to be built. Note that for at least the clean target,
+# this always includes the binary-indep packages.
+packages := $(shell dh_listpackages)
+
 CONFIGURE_EXTRA =
 
 # dpkg-buildflags support
@@ -283,12 +287,12 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
 endif
 endif
 
-ifneq (,$(filter bolt-$(LLVM_VERSION), $(shell dh_listpackages)))
+ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages)))
     PROJECTS += ;bolt
 endif
 
 # flang is only for 64bits
-ifneq (,$(filter flang-$(LLVM_VERSION), $(shell dh_listpackages)))
+ifneq (,$(filter flang-$(LLVM_VERSION), $(packages)))
     PROJECTS += ;flang
 endif
 
@@ -966,8 +970,8 @@ stamps/sccache-stats:
 override_dh_auto_build: \
   stamps/debian-full-build \
   stamps/debian-libfuzzer-build \
-  $(if $(filter libclc-%, $(shell dh_listpackages)),stamps/debian-libclc-build) \
-  $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),stamps/debian-wasm-build) \
+  $(if $(filter libclc-%, $(packages)),stamps/debian-libclc-build) \
+  $(if $(filter %-wasm32 %-wasm64, $(packages)),stamps/debian-wasm-build) \
   stamps/sccache-stats
 
 override_dh_prep: stamps/build_doc
@@ -1304,7 +1308,7 @@ endif
 override_dh_install:
 ifeq (${POLLY_ENABLE},yes)
 # only for arch:any builds
-ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(shell dh_listpackages)))
+ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(packages)))
 	dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly
 # On old Debian & Ubuntu, removing the files is necessary
 	rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
@@ -1315,7 +1319,7 @@ endif
 	dh_install --fail-missing
 # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages
 # These packages are arch: all, so only do so when the packages are built
-ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(shell dh_listpackages)))
+ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(packages)))
 	mkdir -p $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1
 	if test -f $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h; then \
 		mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h \

From 1b34385387b814fb851bf44cc0dee48cc44a3206 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 8 Oct 2023 21:27:07 +0200
Subject: [PATCH 178/349] Cherry-pick upstream patch D142688 to fix the build
 failure on loong64 (Closes: #1053655)

---
 debian/changelog            |   2 +
 debian/patches/D142688.diff | 231 ++++++++++++++++++++++++++++++++++++
 debian/patches/series       |   3 +
 3 files changed, 236 insertions(+)
 create mode 100644 debian/patches/D142688.diff

diff --git a/debian/changelog b/debian/changelog
index 318bfcdd..da516c43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
 
   [ Li Chen ]
   * Add support for loongarch64 (Closes: #1053658)
+  * Cherry-pick upstream patch D142688 to fix the build failure on loong64
+    (Closes: #1053655)
 
   [ Matthias Klose ]
   * Disable the clc and wasm builds when not building binary indep packages.
diff --git a/debian/patches/D142688.diff b/debian/patches/D142688.diff
new file mode 100644
index 00000000..737d0809
--- /dev/null
+++ b/debian/patches/D142688.diff
@@ -0,0 +1,231 @@
+diff --git a/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp b/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
+--- a/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
++++ b/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
+@@ -54,7 +54,28 @@
+   }
+ 
+   // Choose a default based on the triple.
+-  return IsLA32 ? "ilp32d" : "lp64d";
++  // Honor the explicit ABI modifier suffix in triple's environment part if
++  // present, falling back to {ILP32,LP64}D otherwise.
++  switch (Triple.getEnvironment()) {
++  case llvm::Triple::GNUSF:
++    return IsLA32 ? "ilp32s" : "lp64s";
++  case llvm::Triple::GNUF32:
++    return IsLA32 ? "ilp32f" : "lp64f";
++  case llvm::Triple::GNUF64:
++    // This was originally permitted (and indeed the canonical way) to
++    // represent the {ILP32,LP64}D ABIs, but in Feb 2023 Loongson decided to
++    // drop the explicit suffix in favor of unmarked `-gnu` for the
++    // "general-purpose" ABIs, among other non-technical reasons.
++    //
++    // The spec change did not mention whether existing usages of "gnuf64"
++    // shall remain valid or not, so we are going to continue recognizing it
++    // for some time, until it is clear that everyone else has migrated away
++    // from it.
++    [[fallthrough]];
++  case llvm::Triple::GNU:
++  default:
++    return IsLA32 ? "ilp32d" : "lp64d";
++  }
+ }
+ 
+ void loongarch::getLoongArchTargetFeatures(const Driver &D,
+diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -86,6 +86,39 @@
+   case llvm::Triple::aarch64_be:
+     return "aarch64_be-linux-gnu";
+ 
++  case llvm::Triple::loongarch64: {
++    const char *Libc;
++    const char *FPFlavor;
++
++    if (TargetTriple.isGNUEnvironment()) {
++      Libc = "gnu";
++    } else if (TargetTriple.isMusl()) {
++      Libc = "musl";
++    } else {
++      return TargetTriple.str();
++    }
++
++    switch (TargetEnvironment) {
++    default:
++      return TargetTriple.str();
++    case llvm::Triple::GNUSF:
++      FPFlavor = "sf";
++      break;
++    case llvm::Triple::GNUF32:
++      FPFlavor = "f32";
++      break;
++    case llvm::Triple::GNU:
++    case llvm::Triple::GNUF64:
++      // This was going to be "f64" in an earlier Toolchain Conventions
++      // revision, but starting from Feb 2023 the F64 ABI variants are
++      // unmarked in their canonical forms.
++      FPFlavor = "";
++      break;
++    }
++
++    return (Twine("loongarch64-linux-") + Libc + FPFlavor).str();
++  }
++
+   case llvm::Triple::m68k:
+     return "m68k-linux-gnu";
+ 
+diff --git a/clang/test/Driver/Inputs/debian_loong64_tree/usr/include/c++/13/backward/.keep b/clang/test/Driver/Inputs/debian_loong64_tree/usr/include/c++/13/backward/.keep
+new file mode 100644
+diff --git a/clang/test/Driver/Inputs/debian_loong64_tree/usr/include/loongarch64-linux-gnu/c++/.keep b/clang/test/Driver/Inputs/debian_loong64_tree/usr/include/loongarch64-linux-gnu/c++/.keep
+new file mode 100644
+diff --git a/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/gcc/loongarch64-linux-gnu/13/crtbegin.o b/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/gcc/loongarch64-linux-gnu/13/crtbegin.o
+new file mode 100644
+diff --git a/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/gcc/loongarch64-linux-gnu/13/crtend.o b/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/gcc/loongarch64-linux-gnu/13/crtend.o
+new file mode 100644
+diff --git a/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/gcc/loongarch64-linux-gnu/13/include/.keep b/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/gcc/loongarch64-linux-gnu/13/include/.keep
+new file mode 100644
+diff --git a/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/loongarch64-linux-gnu/crt1.o b/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/loongarch64-linux-gnu/crt1.o
+new file mode 100644
+diff --git a/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/loongarch64-linux-gnu/crti.o b/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/loongarch64-linux-gnu/crti.o
+new file mode 100644
+diff --git a/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/loongarch64-linux-gnu/crtn.o b/clang/test/Driver/Inputs/debian_loong64_tree/usr/lib/loongarch64-linux-gnu/crtn.o
+new file mode 100644
+diff --git a/clang/test/Driver/linux-header-search.cpp b/clang/test/Driver/linux-header-search.cpp
+--- a/clang/test/Driver/linux-header-search.cpp
++++ b/clang/test/Driver/linux-header-search.cpp
+@@ -244,6 +244,32 @@
+ // CHECK-GENTOO-4-9-X-32: "-internal-externc-isystem" "[[SYSROOT]]/include"
+ // CHECK-GENTOO-4-9-X-32: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
+ //
++// Check header search on Debian loong64
++// RUN: %clang -### %s -fsyntax-only 2>&1 \
++// RUN:     --target=loongarch64-unknown-linux-gnu -stdlib=libstdc++ \
++// RUN:     --sysroot=%S/Inputs/debian_loong64_tree \
++// RUN:     --gcc-toolchain="" \
++// RUN:   | FileCheck --check-prefix=CHECK-LOONG64-GNU %s
++//
++// Check that "-gnuf64" is seen as "-gnu" for loong64.
++// RUN: %clang -### %s -fsyntax-only 2>&1 \
++// RUN:     --target=loongarch64-unknown-linux-gnuf64 -stdlib=libstdc++ \
++// RUN:     --sysroot=%S/Inputs/debian_loong64_tree \
++// RUN:     --gcc-toolchain="" \
++// RUN:   | FileCheck --check-prefix=CHECK-LOONG64-GNU %s
++// CHECK-LOONG64-GNU: "-cc1"
++// CHECK-LOONG64-GNU: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
++// CHECK-LOONG64-GNU: "-isysroot" "[[SYSROOT:[^"]+]]"
++// CHECK-LOONG64-GNU: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/loongarch64-linux-gnu/13/../../../../include/c++/13"
++// CHECK-LOONG64-GNU: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/loongarch64-linux-gnu/13/../../../../include/c++/13/loongarch64-linux-gnu"
++// CHECK-LOONG64-GNU: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/loongarch64-linux-gnu/13/../../../../include/c++/13/backward"
++// CHECK-LOONG64-GNU: "-internal-isystem" "[[RESOURCE_DIR]]{{/|\\\\}}include"
++// CHECK-LOONG64-GNU: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
++// CHECK-LOONG64-GNU: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/loongarch64-linux-gnu/13/../../../../loongarch64-linux-gnu/include"
++// CHECK-LOONG64-GNU: "-internal-externc-isystem" "[[SYSROOT]]/usr/include/loongarch64-linux-gnu"
++// CHECK-LOONG64-GNU: "-internal-externc-isystem" "[[SYSROOT]]/include"
++// CHECK-LOONG64-GNU: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"
++//
+ // Check header search on Debian 6 / MIPS64
+ // RUN: %clang -### %s -fsyntax-only 2>&1 \
+ // RUN:     --target=mips64-unknown-linux-gnuabi64 -stdlib=libstdc++ \
+diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
+--- a/clang/test/Driver/linux-ld.c
++++ b/clang/test/Driver/linux-ld.c
+@@ -830,6 +830,30 @@
+ // CHECK-ARM-HF: "-dynamic-linker" "{{.*}}/lib/ld-linux-armhf.so.3"
+ //
+ // RUN: %clang -### %s -no-pie 2>&1 \
++// RUN:     --target=loongarch64-linux-gnu \
++// RUN:   | FileCheck --check-prefix=CHECK-LOONGARCH-LP64D %s
++// RUN: %clang -### %s -no-pie 2>&1 \
++// RUN:     --target=loongarch64-linux-gnuf64 \
++// RUN:   | FileCheck --check-prefix=CHECK-LOONGARCH-LP64D %s
++// CHECK-LOONGARCH-LP64D: "{{.*}}ld{{(.exe)?}}"
++// CHECK-LOONGARCH-LP64D: "-m" "elf64loongarch"
++// CHECK-LOONGARCH-LP64D: "-dynamic-linker" "{{.*}}/lib64/ld-linux-loongarch-lp64d.so.1"
++//
++// RUN: %clang -### %s -no-pie 2>&1 \
++// RUN:     --target=loongarch64-linux-gnuf32 \
++// RUN:   | FileCheck --check-prefix=CHECK-LOONGARCH-LP64F %s
++// CHECK-LOONGARCH-LP64F: "{{.*}}ld{{(.exe)?}}"
++// CHECK-LOONGARCH-LP64F: "-m" "elf64loongarch"
++// CHECK-LOONGARCH-LP64F: "-dynamic-linker" "{{.*}}/lib64/ld-linux-loongarch-lp64f.so.1"
++//
++// RUN: %clang -### %s -no-pie 2>&1 \
++// RUN:     --target=loongarch64-linux-gnusf \
++// RUN:   | FileCheck --check-prefix=CHECK-LOONGARCH-LP64S %s
++// CHECK-LOONGARCH-LP64S: "{{.*}}ld{{(.exe)?}}"
++// CHECK-LOONGARCH-LP64S: "-m" "elf64loongarch"
++// CHECK-LOONGARCH-LP64S: "-dynamic-linker" "{{.*}}/lib64/ld-linux-loongarch-lp64s.so.1"
++//
++// RUN: %clang -### %s -no-pie 2>&1 \
+ // RUN:     --target=powerpc64-linux-gnu \
+ // RUN:   | FileCheck --check-prefix=CHECK-PPC64 %s
+ // CHECK-PPC64: "{{.*}}ld{{(.exe)?}}"
+@@ -1311,6 +1335,29 @@
+ // RUN:   | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD-LINK %s
+ // CHECK-ANDROID-PTHREAD-LINK-NOT: argument unused during compilation: '-pthread'
+ //
++// Check linker invocation on a Debian LoongArch sysroot.
++// RUN: %clang -### %s -no-pie 2>&1 \
++// RUN:     --target=loongarch64-linux-gnu -rtlib=platform \
++// RUN:     --gcc-toolchain="" \
++// RUN:     --sysroot=%S/Inputs/debian_loong64_tree \
++// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-ML-LOONG64 %s
++//
++// Check that "-gnuf64" is seen as "-gnu" for loong64.
++// RUN: %clang -### %s -no-pie 2>&1 \
++// RUN:     --target=loongarch64-linux-gnuf64 -rtlib=platform \
++// RUN:     --gcc-toolchain="" \
++// RUN:     --sysroot=%S/Inputs/debian_loong64_tree \
++// RUN:   | FileCheck --check-prefix=CHECK-DEBIAN-ML-LOONG64 %s
++// CHECK-DEBIAN-ML-LOONG64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
++// CHECK-DEBIAN-ML-LOONG64: "[[SYSROOT]]/usr/lib/loongarch64-linux-gnu/crt1.o"
++// CHECK-DEBIAN-ML-LOONG64: "[[SYSROOT]]/usr/lib/loongarch64-linux-gnu/crti.o"
++// CHECK-DEBIAN-ML-LOONG64: "[[SYSROOT]]/usr/lib/gcc/loongarch64-linux-gnu/13/crtbegin.o"
++// CHECK-DEBIAN-ML-LOONG64: "-L[[SYSROOT]]/usr/lib/gcc/loongarch64-linux-gnu/13"
++// CHECK-DEBIAN-ML-LOONG64: "-L[[SYSROOT]]/usr/lib/loongarch64-linux-gnu"
++// CHECK-DEBIAN-ML-LOONG64: "-L[[SYSROOT]]/usr/lib"
++// CHECK-DEBIAN-ML-LOONG64: "[[SYSROOT]]/usr/lib/gcc/loongarch64-linux-gnu/13/crtend.o"
++// CHECK-DEBIAN-ML-LOONG64: "[[SYSROOT]]/usr/lib/loongarch64-linux-gnu/crtn.o"
++//
+ // Check linker invocation on Debian 6 MIPS 32/64-bit.
+ // RUN: %clang -### %s -no-pie 2>&1 \
+ // RUN:     --target=mipsel-linux-gnu -rtlib=platform \
+diff --git a/clang/test/Driver/loongarch-abi.c b/clang/test/Driver/loongarch-abi.c
+--- a/clang/test/Driver/loongarch-abi.c
++++ b/clang/test/Driver/loongarch-abi.c
+@@ -16,6 +16,34 @@
+ // RUN: %clang --target=loongarch64-unknown-elf %s -fsyntax-only -### -mabi=lp64d 2>&1 \
+ // RUN:   | FileCheck --check-prefix=LP64D %s
+ 
++// RUN: %clang --target=loongarch32-linux-gnusf %s -fsyntax-only -### 2>&1 \
++// RUN:   | FileCheck --check-prefix=ILP32S %s
++// RUN: %clang --target=loongarch32-linux-gnuf32 %s -fsyntax-only -### 2>&1 \
++// RUN:   | FileCheck --check-prefix=ILP32F %s
++// RUN: %clang --target=loongarch32-linux-gnuf64 %s -fsyntax-only -### 2>&1 \
++// RUN:   | FileCheck --check-prefix=ILP32D %s
++// RUN: %clang --target=loongarch32-linux-gnu %s -fsyntax-only -### 2>&1 \
++// RUN:   | FileCheck --check-prefix=ILP32D %s
++
++// RUN: %clang --target=loongarch64-linux-gnusf %s -fsyntax-only -### 2>&1 \
++// RUN:   | FileCheck --check-prefix=LP64S %s
++// RUN: %clang --target=loongarch64-linux-gnuf32 %s -fsyntax-only -### 2>&1 \
++// RUN:   | FileCheck --check-prefix=LP64F %s
++// RUN: %clang --target=loongarch64-linux-gnuf64 %s -fsyntax-only -### 2>&1 \
++// RUN:   | FileCheck --check-prefix=LP64D %s
++// RUN: %clang --target=loongarch64-linux-gnu %s -fsyntax-only -### 2>&1 \
++// RUN:   | FileCheck --check-prefix=LP64D %s
++
++// Check that -mabi prevails in case of conflicts with the triple-implied ABI.
++// RUN: %clang --target=loongarch32-linux-gnuf64 %s -fsyntax-only -### -mabi=ilp32s 2>&1 \
++// RUN:   | FileCheck --check-prefix=ILP32S %s
++// RUN: %clang --target=loongarch64-linux-gnuf64 %s -fsyntax-only -### -mabi=lp64s 2>&1 \
++// RUN:   | FileCheck --check-prefix=LP64S %s
++// RUN: %clang --target=loongarch32-linux-gnu %s -fsyntax-only -### -mabi=ilp32s 2>&1 \
++// RUN:   | FileCheck --check-prefix=ILP32S %s
++// RUN: %clang --target=loongarch64-linux-gnu %s -fsyntax-only -### -mabi=lp64s 2>&1 \
++// RUN:   | FileCheck --check-prefix=LP64S %s
++
+ // ILP32S: "-target-abi" "ilp32s"
+ // ILP32F: "-target-abi" "ilp32f"
+ // ILP32D: "-target-abi" "ilp32d"
+
diff --git a/debian/patches/series b/debian/patches/series
index cf3bb85f..2c45b075 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -153,3 +153,6 @@ ubuntu-releases.patch
 new-cmake-build-fix.patch
 HIP-search-path-fix.patch
 D158066-simd-ppc64el.patch
+
+# LoongArch patches
+D142688.diff

From 0c924f818333b2392cf2abe2ed14b9376d323c8d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 8 Oct 2023 21:27:41 +0200
Subject: [PATCH 179/349] rename the patch

---
 debian/patches/{D142688.diff => D142688-loong64.diff} | 0
 debian/patches/series                                 | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename debian/patches/{D142688.diff => D142688-loong64.diff} (100%)

diff --git a/debian/patches/D142688.diff b/debian/patches/D142688-loong64.diff
similarity index 100%
rename from debian/patches/D142688.diff
rename to debian/patches/D142688-loong64.diff
diff --git a/debian/patches/series b/debian/patches/series
index 2c45b075..f0e08fbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -154,5 +154,4 @@ new-cmake-build-fix.patch
 HIP-search-path-fix.patch
 D158066-simd-ppc64el.patch
 
-# LoongArch patches
-D142688.diff
+D142688-loong64.diff

From 5392b48137369754476fd97b4ed6d31161c6d22e Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Mon, 9 Oct 2023 04:20:04 +0200
Subject: [PATCH 180/349]   * d/rules/preconfigure: Print info about build
 environment.

---
 debian/changelog | 1 +
 debian/rules     | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 81d70bd2..e0835a8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
   * Build-depend on libncurses-dev instead of libncurses5-dev.
   * Use a stamps subdirectory for all build stamps.
   * Factor-out the calls to dh_listpackages.
+  * d/rules/preconfigure: Print info about build environment.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 04 Oct 2023 09:46:49 +0200
 
diff --git a/debian/rules b/debian/rules
index fe2f03a2..43883ba2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -539,6 +539,14 @@ stamps/preconfigure:
 		echo "llvm spriv isn't detected while it should probably for this distro"; \
 	fi
 
+	@echo "Memory:"
+	@if [ -e /proc/meminfo ]; then \
+		cat /proc/meminfo | grep -E '(Mem|Swap)Free|Cached'; \
+	else \
+		echo "  No memory info available"; \
+	fi
+	@echo "Processors: $$(cat /proc/cpuinfo | grep --count '^processor')"
+
 	@echo "DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)"
 	@echo "DEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)"
 	@echo "DEB_HOST_GNU_TYPE=$(DEB_HOST_GNU_TYPE)"

From 3cf9c2399c53791ba2b2244b98770ff90310af73 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 9 Oct 2023 08:46:15 +0200
Subject: [PATCH 181/349]  prepare upload

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index da516c43..cd5e2ac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-16 (1:16.0.6-16) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Make libclang-common-16-dev arch:any (Closes: #1041455)

From 6241366525e76f8cc7c71db3a18ff30e976797ea Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 14 Oct 2023 18:39:14 +0200
Subject: [PATCH 182/349] Revert:   [ Gianfranco Costamagna ]   * Make
 libclang-common-16-dev arch:any (Closes: #1041455)     It was arch:all
 because all the code isn't arch dependant

---
 debian/changelog  | 10 +---------
 debian/control    |  4 ++--
 debian/control.in |  4 ++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd5e2ac8..8a75203d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,5 @@
 llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium
 
-  [ Gianfranco Costamagna ]
-  * Make libclang-common-16-dev arch:any (Closes: #1041455)
-    It was arch:all because all the code isn't arch dependant
-    However, it causes issues for cross build.
-    So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
-    instead of source
-
-  [ Sylvestre Ledru ]
   * Bring back old version of spirv - necessary for apt.llvm.org
 
   [ Alexandre Detiste ]
@@ -23,7 +15,7 @@ llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium
   * Limit the parallel links to 2 on riscv64.
   * d/rules: Be less noisy when building without grpc.
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 08 Oct 2023 09:11:38 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 14 Oct 2023 18:37:48 +0200
 
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 5abd8387..33ceb190 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/16
 Package: clang-16
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-16-dev (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang-common-16-dev (= ${source:Version}),
  llvm-16-linker-tools (= ${binary:Version}),
  libclang1-16 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -168,7 +168,7 @@ Description: Clang library - Development package
  libclang1-16.
 
 Package: libclang-common-16-dev
-Architecture: any
+Architecture: all
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (>= ${source:Version}),
  libllvm16 (<< ${source:Version}.1~)
diff --git a/debian/control.in b/debian/control.in
index 3505c06d..6802113a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -45,7 +45,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_
 Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
  libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -168,7 +168,7 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: any
+Architecture: all
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (>= ${source:Version}),
  libllvm@LLVM_VERSION@ (<< ${source:Version}.1~)

From afd2b3f5b31fd454e74a0d9c141fe71b3b9b2903 Mon Sep 17 00:00:00 2001
From: chenli <chenli@loongson.cn>
Date: Mon, 16 Oct 2023 19:51:14 +0800
Subject: [PATCH 183/349] Add support for loongarch64

The details are as follows:
* Do not try to install hwasan_symbolize on loong64.
* Enable libunwind, lld, lldb and openmp on loong64.
---
 debian/clang-tools-X.Y.install.in |   2 +-
 debian/control                    |  24 ++--
 debian/control.in                 |  24 ++--
 debian/libomp-X.Y-dev.install.in  |  12 +-
 debian/libomp5-X.Y.install.in     |   2 +-
 debian/libomp5-X.Y.symbols.in     | 220 +++++++++++++++---------------
 6 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in
index 6a0d0c4c..3002792a 100644
--- a/debian/clang-tools-X.Y.install.in
+++ b/debian/clang-tools-X.Y.install.in
@@ -61,7 +61,7 @@ usr/lib/llvm-@LLVM_VERSION@/libexec/analyze-cc
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc
 
-[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
+[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64 !loong64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
 
 clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 clang/tools/scan-view-@LLVM_VERSION@       usr/share/clang/
diff --git a/debian/control b/debian/control
index b41d2e9b..33ccb08c 100644
--- a/debian/control
+++ b/debian/control
@@ -520,7 +520,7 @@ Description: Modular compiler and toolchain technologies, examples
 # ------------- lld -------------
 
 Package: lld-17
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -530,7 +530,7 @@ Description: LLVM-based linker
  Project.
 
 Package: liblld-17
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -544,7 +544,7 @@ Description: LLVM-based linker, library
 
 Package: liblld-17-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lld-17 (= ${binary:Version}),
  liblld-17 (= ${binary:Version}), libzstd-dev, zlib1g-dev
@@ -560,7 +560,7 @@ Description: LLVM-based linker, header files
 # ------------- lldb -------------
 
 Package: lldb-17
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}),
  python3-lldb-17
@@ -571,7 +571,7 @@ Description: Next generation, high-performance debugger
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-17
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -585,7 +585,7 @@ Description: Next generation, high-performance debugger, library
 
 Package: python3-lldb-17
 Section: python
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-17 (= ${binary:Version}), python3-six
 Conflicts: python3-lldb-x.y
@@ -601,7 +601,7 @@ Description: Next generation, high-performance debugger, python3 lib
 
 Package: liblldb-17-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-17 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -619,7 +619,7 @@ Description: Next generation, high-performance debugger, header files
 
 Package: libomp-17-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: libomp5-17 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-17-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
@@ -633,7 +633,7 @@ Description: LLVM OpenMP runtime - dev package
 
 Package: libomp5-17
 Multi-Arch: same
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: libomp5 (<< 44)
 Provides: libomp-x.y
@@ -688,7 +688,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends},
- libunwind-17-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
+ libunwind-17-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -828,7 +828,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-17
 Section: libs
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -845,7 +845,7 @@ Description: production-quality unwinder
 
 Package: libunwind-17-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
diff --git a/debian/control.in b/debian/control.in
index 5bd27e2f..547e91f0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -520,7 +520,7 @@ Description: Modular compiler and toolchain technologies, examples
 # ------------- lld -------------
 
 Package: lld-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -530,7 +530,7 @@ Description: LLVM-based linker
  Project.
 
 Package: liblld-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -544,7 +544,7 @@ Description: LLVM-based linker, library
 
 Package: liblld-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lld-@LLVM_VERSION@ (= ${binary:Version}),
  liblld-@LLVM_VERSION@ (= ${binary:Version}), libzstd-dev, zlib1g-dev
@@ -560,7 +560,7 @@ Description: LLVM-based linker, header files
 # ------------- lldb -------------
 
 Package: lldb-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}),
  python3-lldb-@LLVM_VERSION@
@@ -571,7 +571,7 @@ Description: Next generation, high-performance debugger
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -585,7 +585,7 @@ Description: Next generation, high-performance debugger, library
 
 Package: python3-lldb-@LLVM_VERSION@
 Section: python
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version}), python3-six
 Conflicts: python3-lldb-x.y
@@ -601,7 +601,7 @@ Description: Next generation, high-performance debugger, python3 lib
 
 Package: liblldb-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -619,7 +619,7 @@ Description: Next generation, high-performance debugger, header files
 
 Package: libomp-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: libomp5-@LLVM_VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-@LLVM_VERSION@-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
@@ -633,7 +633,7 @@ Description: LLVM OpenMP runtime - dev package
 
 Package: libomp5-@LLVM_VERSION@
 Multi-Arch: same
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: libomp5 (<< 44)
 Provides: libomp-x.y
@@ -688,7 +688,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends},
- libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
+ libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -828,7 +828,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-@LLVM_VERSION@
 Section: libs
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -845,7 +845,7 @@ Description: production-quality unwinder
 
 Package: libunwind-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in
index 081d2c52..ff72a7d7 100644
--- a/debian/libomp-X.Y-dev.install.in
+++ b/debian/libomp-X.Y-dev.install.in
@@ -7,16 +7,16 @@
 [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a
 [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so
 
-[amd64 ppc64el arm64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a
+[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a
 
-[amd64 ppc64el arm64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc
+[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc
 
 usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake
 
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay
+[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info
+[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay
 
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
+[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@
+[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
 
 [!armhf] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/
diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Y.install.in
index eea9615b..f20a405a 100644
--- a/debian/libomp5-X.Y.install.in
+++ b/debian/libomp5-X.Y.install.in
@@ -1,4 +1,4 @@
 #!/usr/bin/dh-exec
 
 usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5
-[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@
+[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@
diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in
index 13e614d3..908dea6b 100644
--- a/debian/libomp5-X.Y.symbols.in
+++ b/debian/libomp5-X.Y.symbols.in
@@ -296,36 +296,36 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmp_wait_64@VERSION 0.20140926
  __kmpc_aligned_alloc@VERSION 14
  __kmpc_alloc@VERSION 8
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_10@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_10@VERSION 0.20130412
  __kmpc_atomic_16@VERSION 0.20130412
  __kmpc_atomic_1@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_20@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_20@VERSION 0.20130412
  __kmpc_atomic_2@VERSION 0.20130412
  __kmpc_atomic_32@VERSION 0.20130412
  __kmpc_atomic_4@VERSION 0.20130412
  __kmpc_atomic_8@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_1_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_1_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_2_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_2_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_4_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_4_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_8_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_8_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_add@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_1_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_1_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_2_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_2_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_4_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_4_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_8_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_8_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_add_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_mul@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_mul_cpt@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_rd@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_wr@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_cmplx16_add@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_add_cpt@VERSION 0.20130412
@@ -348,8 +348,8 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_cmplx4_div@VERSION 0.20130412
  __kmpc_atomic_cmplx4_div_cmplx8@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_div_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_div_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_div_rev@VERSION 0.20130412
  __kmpc_atomic_cmplx4_mul@VERSION 0.20130412
  __kmpc_atomic_cmplx4_mul_cmplx8@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_mul_cpt@VERSION 0.20130412
@@ -357,24 +357,24 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_cmplx4_sub@VERSION 0.20130412
  __kmpc_atomic_cmplx4_sub_cmplx8@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_sub_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_sub_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_sub_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_wr@VERSION 0.20130412
  __kmpc_atomic_cmplx8_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_add_cpt@VERSION 0.20130412
  __kmpc_atomic_cmplx8_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_div_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_div_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_div_rev@VERSION 0.20130412
  __kmpc_atomic_cmplx8_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_mul_cpt@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_rd@VERSION 0.20130412
  __kmpc_atomic_cmplx8_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_sub_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_sub_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_sub_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_wr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_end@VERSION 0.20130412
  (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed1_add@VERSION 0.20130412
@@ -388,11 +388,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_fixed1_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed1_div_float8@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed1_eqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_eqv_cpt@VERSION 0.20130412
@@ -414,21 +414,21 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_rd@VERSION 0.20130412
  __kmpc_atomic_fixed1_shl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shl_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shl_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shl_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shl_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shl_rev@VERSION 0.20130412
  __kmpc_atomic_fixed1_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shr_rev@VERSION 0.20130412
  __kmpc_atomic_fixed1_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_sub_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_sub_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_wr@VERSION 0.20130412
  __kmpc_atomic_fixed1_xor@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_xor_cpt@VERSION 0.20130412
@@ -437,17 +437,17 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_fixed1u_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1u_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_mul_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_mul_fp@VERSION 4.0
  __kmpc_atomic_fixed1u_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_shr_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_sub_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_sub_fp@VERSION 4.0
@@ -463,11 +463,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_fixed2_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed2_div_float8@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed2_eqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_eqv_cpt@VERSION 0.20130412
@@ -489,21 +489,21 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_rd@VERSION 0.20130412
  __kmpc_atomic_fixed2_shl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shl_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shl_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shl_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shl_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shl_rev@VERSION 0.20130412
  __kmpc_atomic_fixed2_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shr_rev@VERSION 0.20130412
  __kmpc_atomic_fixed2_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_sub_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_sub_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_wr@VERSION 0.20130412
  __kmpc_atomic_fixed2_xor@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_xor_cpt@VERSION 0.20130412
@@ -512,17 +512,17 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_fixed2u_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2u_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_mul_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_mul_fp@VERSION 4.0
  __kmpc_atomic_fixed2u_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_shr_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_sub_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_sub_fp@VERSION 4.0
@@ -538,11 +538,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_fixed4_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed4_div_float8@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed4_eqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_eqv_cpt@VERSION 0.20130412
@@ -564,21 +564,21 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_rd@VERSION 0.20130412
  __kmpc_atomic_fixed4_shl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shl_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shl_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shl_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shl_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shl_rev@VERSION 0.20130412
  __kmpc_atomic_fixed4_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shr_rev@VERSION 0.20130412
  __kmpc_atomic_fixed4_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_sub_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_sub_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_wr@VERSION 0.20130412
  __kmpc_atomic_fixed4_xor@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_xor_cpt@VERSION 0.20130412
@@ -587,17 +587,17 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed4u_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4u_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_mul_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_mul_fp@VERSION 4.0
  __kmpc_atomic_fixed4u_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_shr_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_sub_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_sub_fp@VERSION 4.0
@@ -613,11 +613,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_fixed8_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed8_div_float8@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_rev_fp@VERSION 4.0
  __kmpc_atomic_fixed8_eqv@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_eqv_cpt@VERSION 0.20130412
@@ -639,21 +639,21 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_rd@VERSION 0.20130412
  __kmpc_atomic_fixed8_shl@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shl_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shl_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shl_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shl_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shl_rev@VERSION 0.20130412
  __kmpc_atomic_fixed8_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shr_rev@VERSION 0.20130412
  __kmpc_atomic_fixed8_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_sub_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_sub_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_wr@VERSION 0.20130412
  __kmpc_atomic_fixed8_xor@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_xor_cpt@VERSION 0.20130412
@@ -662,51 +662,51 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_fixed8u_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8u_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_mul_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_mul_fp@VERSION 4.0
  __kmpc_atomic_fixed8u_shr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_cpt@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_cpt_rev@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_shr_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_shr_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_sub_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_sub_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed8u_sub_rev_fp@VERSION 5.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_add@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_add_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_add_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_add_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_max@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_max@VERSION 14
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_max_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_min@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_min@VERSION 14
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_min_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_mul@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_mul@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_mul_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_mul_cpt_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_mul_fp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_rd@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_wr@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_add@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_add_cpt@VERSION 0.20130412
@@ -735,11 +735,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_float4_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_float4_div_float8@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_rev_fp@VERSION 4.0
  __kmpc_atomic_float4_max@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_max_cpt@VERSION 0.20130412
@@ -754,13 +754,13 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_float4_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_sub_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_cpt_rev_fp@VERSION 4.0
  __kmpc_atomic_float4_sub_float8@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_sub_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_wr@VERSION 0.20130412
  __kmpc_atomic_float8_add@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_add_cpt@VERSION 0.20130412
@@ -769,10 +769,10 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_float8_div@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_div_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_div_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_div_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_rev_fp@VERSION 4.0
  __kmpc_atomic_float8_max@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_max_cpt@VERSION 0.20130412
@@ -786,22 +786,22 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
  __kmpc_atomic_float8_sub@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_cpt@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_cpt_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_cpt_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_sub_cpt_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_cpt_rev_fp@VERSION 4.0
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_sub_fp@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_rev@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_sub_rev@VERSION 0.20130412
 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_rev_fp@VERSION 4.0
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_swp@VERSION 0.20130412
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_swp@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_wr@VERSION 0.20130412
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_start@VERSION 0.20130412
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_1_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_1_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_2_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_2_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_4_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_4_cas_cpt@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_8_cas@VERSION 14
- (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_8_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_1_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_1_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_2_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_2_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_4_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_4_cas_cpt@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_8_cas@VERSION 14
+ (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_8_cas_cpt@VERSION 14
  __kmpc_barrier@VERSION 0.20130412
  __kmpc_barrier_master@VERSION 0.20130412
  __kmpc_barrier_master_nowait@VERSION 0.20130412

From 9e9670bd0d34522adce4fac6850b7b1dae56a63c Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 18 Oct 2023 14:58:39 +0200
Subject: [PATCH 184/349]   [ Sylvestre Ledru ]   * New upstream release

---
 debian/changelog | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0835a8b..d2b69887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium
 
   [ Matthias Klose ]
   * Consolidate the build flags for the wasm builds.
@@ -10,7 +10,10 @@ llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
   * Factor-out the calls to dh_listpackages.
   * d/rules/preconfigure: Print info about build environment.
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 04 Oct 2023 09:46:49 +0200
+  [ Sylvestre Ledru ]
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 17 Oct 2023 08:44:01 +0200
 
 llvm-toolchain-17 (1:17.0.2-1~exp1) experimental; urgency=medium
 

From daac8f3d73722b2547d4e6b702c2cb221a6f7912 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 18 Oct 2023 15:13:57 +0200
Subject: [PATCH 185/349]   [ Matthias Klose ]   * Limit the number of parallel
 processes based on the available memory     and the packages to be built
 (flang has some memory hogs).

---
 debian/changelog |  8 ++++++++
 debian/rules     | 30 +++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2b69887..84c821ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+llvm-toolchain-17 (1:17.0.3-1~exp2) UNRELEASED; urgency=medium
+
+  [ Matthias Klose ]
+  * Limit the number of parallel processes based on the available memory
+    and the packages to be built (flang has some memory hogs).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 18 Oct 2023 15:00:25 +0200
+
 llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium
 
   [ Matthias Klose ]
diff --git a/debian/rules b/debian/rules
index 43883ba2..cb65d3f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,27 +27,38 @@ else
   BRANCH_NAME=$(LLVM_VERSION)
 endif
 
+VENDOR=$(shell lsb_release -is)
+DISTRO=$(shell lsb_release -sc)
+
 SONAME_EXT      := 1
 SONAME_OPENMP	:= 5
 # Manage the case when the version is 3.5~svn213052-1~exp1 or 3.4.2-1
 DEBIAN_REVISION := $(shell dpkg-parsechangelog |  sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p")
 ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
-  NJOBS := $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+  NCPUS := $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 else
-  NJOBS := $(shell nproc)
+  NCPUS := $(shell nproc)
 endif
 
-VENDOR=$(shell lsb_release -is)
-DISTRO=$(shell lsb_release -sc)
-
-DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
-
-include /usr/share/dpkg/architecture.mk
-
 # this contains all packages to be built. Note that for at least the clean target,
 # this always includes the binary-indep packages.
 packages := $(shell dh_listpackages)
 
+# flang has some memory hogs, of up to 6.2gb per process. Limit the parallel jobs
+# based on the available memory
+ifneq (,$(filter flang-$(LLVM_VERSION), $(packages)))
+  MEM_PER_CPU=3900
+else
+  MEM_PER_CPU=2100
+endif
+NJOBS := $(shell mt=`awk '/^MemTotal/ { print $$2 }' /proc/meminfo`; \
+		awk -vn=$(NCPUS) -vmt=$$mt -vm=$(MEM_PER_CPU) \
+		  'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2<n+1 ? n2 : n+1}' < /dev/null)
+
+DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
+
+include /usr/share/dpkg/architecture.mk
+
 CONFIGURE_EXTRA =
 
 # dpkg-buildflags support
@@ -546,6 +557,7 @@ stamps/preconfigure:
 		echo "  No memory info available"; \
 	fi
 	@echo "Processors: $$(cat /proc/cpuinfo | grep --count '^processor')"
+	@echo "Used Processors: $(NJOBS) (out of $(NCPUS)), $(MEM_PER_CPU)kb/processor"
 
 	@echo "DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)"
 	@echo "DEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)"

From 9ef19e939c36b8f71c4fa335a3891eed3f3be846 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 19 Oct 2023 22:37:38 +0200
Subject: [PATCH 186/349] Try to fix the wasm path detection (Closes: #1052002)

---
 debian/changelog                          |  6 ++++
 debian/patches/wasm/wasm-sysroot-usr.diff | 36 ++++++++++++++++-------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a75203d..fa3574b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-16 (1:16.0.6-17) unstable; urgency=medium
+
+  * Try to fix the wasm path detection (Closes: #1052002)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 19 Oct 2023 22:37:29 +0200
+
 llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium
 
   * Bring back old version of spirv - necessary for apt.llvm.org
diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff
index 6587c1bd..0df6ce9e 100644
--- a/debian/patches/wasm/wasm-sysroot-usr.diff
+++ b/debian/patches/wasm/wasm-sysroot-usr.diff
@@ -1,5 +1,7 @@
---- a/clang/lib/Driver/ToolChains/WebAssembly.cpp
-+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp
+Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
+===================================================================
+--- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
++++ llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
 @@ -174,7 +174,7 @@ WebAssembly::WebAssembly(const Driver &D
  
    getProgramPaths().push_back(getDriver().getInstalledDir());
@@ -17,19 +19,31 @@
  
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
      SmallString<128> P(D.ResourceDir);
-@@ -427,10 +428,18 @@ void WebAssembly::AddClangSystemIncludeA
+@@ -425,12 +426,29 @@ void WebAssembly::AddClangSystemIncludeA
+     return;
+   }
  
 +  // add the multiarch path on e.g. wasm32-wasi
    if (getTriple().getOS() != llvm::Triple::UnknownOS) {
      const std::string MultiarchTriple =
 -        getMultiarchTriple(D, getTriple(), D.SysRoot);
 -    addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include/" + MultiarchTriple);
+-  }
+-  addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
 +        getMultiarchTriple(D, getTriple(), SysRoot);
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/local/include/" + MultiarchTriple);
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/local/include");
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/include/" + MultiarchTriple);
-   }
--  addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
++	std::string LibPath = SysRoot	+ "/include";
++	std::string Version = detectLibcxxVersion(LibPath);
++
++	if (!getDriver().SysRoot.empty()) {
++		// Second add the generic one.
++		addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
++		// Third the backward one.
++		addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
++	}
++  }
 +
 +  // also add the non-multiarch path, only on a known OS (as above), or when
 +  // a sysroot is given, for backwards compatibility with the original driver
@@ -39,7 +53,7 @@
  }
  
  void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
-@@ -478,6 +479,17 @@ Tool *WebAssembly::buildLinker() const {
+@@ -478,6 +496,17 @@ Tool *WebAssembly::buildLinker() const {
    return new tools::wasm::Linker(*this);
  }
  
@@ -57,7 +71,7 @@
  void WebAssembly::addLibCxxIncludePaths(
      const llvm::opt::ArgList &DriverArgs,
      llvm::opt::ArgStringList &CC1Args) const {
-@@ -499,7 +519,9 @@ void WebAssembly::addLibCxxIncludePaths(
+@@ -499,7 +528,9 @@ void WebAssembly::addLibCxxIncludePaths(
    }
  
    // Second add the generic one.
@@ -68,7 +82,7 @@
  }
  
  void WebAssembly::addLibStdCXXIncludePaths(
-@@ -546,8 +568,11 @@ void WebAssembly::addLibStdCXXIncludePat
+@@ -546,8 +577,11 @@ void WebAssembly::addLibStdCXXIncludePat
      addSystemInclude(DriverArgs, CC1Args, TargetDir);
    }
  
@@ -84,8 +98,10 @@
 +    addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
 +  }
  }
---- a/clang/lib/Driver/ToolChains/WebAssembly.h
-+++ b/clang/lib/Driver/ToolChains/WebAssembly.h
+Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.h
+===================================================================
+--- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.h
++++ llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.h
 @@ -89,6 +89,8 @@ private:
                               llvm::opt::ArgStringList &CC1Args) const;
    void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs,

From 51c7366db907c8099599849a9a23f1ffe2b30ac3 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 24 Oct 2023 12:24:48 +0200
Subject: [PATCH 187/349] Revert "Revert:"

This reverts commit 6241366525e76f8cc7c71db3a18ff30e976797ea.
---
 debian/changelog  | 10 +++++++++-
 debian/control    |  4 ++--
 debian/control.in |  4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa3574b0..3ec71bbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,14 @@ llvm-toolchain-16 (1:16.0.6-17) unstable; urgency=medium
 
 llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium
 
+  [ Gianfranco Costamagna ]
+  * Make libclang-common-16-dev arch:any (Closes: #1041455)
+    It was arch:all because all the code isn't arch dependant
+    However, it causes issues for cross build.
+    So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
+    instead of source
+
+  [ Sylvestre Ledru ]
   * Bring back old version of spirv - necessary for apt.llvm.org
 
   [ Alexandre Detiste ]
@@ -21,7 +29,7 @@ llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium
   * Limit the parallel links to 2 on riscv64.
   * d/rules: Be less noisy when building without grpc.
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 14 Oct 2023 18:37:48 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 08 Oct 2023 09:11:38 +0200
 
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 33ceb190..5abd8387 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/16
 Package: clang-16
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-16-dev (= ${source:Version}),
+ ${dep:devlibs-objc}, libclang-common-16-dev (= ${binary:Version}),
  llvm-16-linker-tools (= ${binary:Version}),
  libclang1-16 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -168,7 +168,7 @@ Description: Clang library - Development package
  libclang1-16.
 
 Package: libclang-common-16-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (>= ${source:Version}),
  libllvm16 (<< ${source:Version}.1~)
diff --git a/debian/control.in b/debian/control.in
index 6802113a..3505c06d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -45,7 +45,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_
 Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
+ ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
  libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -168,7 +168,7 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (>= ${source:Version}),
  libllvm@LLVM_VERSION@ (<< ${source:Version}.1~)

From 2946aa5c70045e65e669af99fdf564475fd9515f Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 24 Oct 2023 12:37:57 +0200
Subject: [PATCH 188/349] Fixup the move from all to any

---
 debian/control    | 7 +++----
 debian/control.in | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 5abd8387..1536aeb4 100644
--- a/debian/control
+++ b/debian/control
@@ -104,7 +104,7 @@ Description: clang-based C++ linter tool
 Package: clangd-16
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libclang-common-16-dev (= ${source:Version})
+ libclang-common-16-dev (= ${binary:Version})
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
   - code completion
@@ -155,7 +155,7 @@ Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang1-16 (= ${binary:Version}),
- libclang-common-16-dev (= ${source:Version})
+ libclang-common-16-dev (= ${binary:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -170,8 +170,7 @@ Description: Clang library - Development package
 Package: libclang-common-16-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (>= ${source:Version}),
- libllvm16 (<< ${source:Version}.1~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
 Recommends: libclang-rt-16-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
diff --git a/debian/control.in b/debian/control.in
index 3505c06d..0fa0ac04 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -104,7 +104,7 @@ Description: clang-based C++ linter tool
 Package: clangd-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libclang-common-@LLVM_VERSION@-dev (= ${source:Version})
+ libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
   - code completion
@@ -155,7 +155,7 @@ Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@ (= ${binary:Version}),
- libclang-common-@LLVM_VERSION@-dev (= ${source:Version})
+ libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -170,8 +170,7 @@ Description: Clang library - Development package
 Package: libclang-common-@LLVM_VERSION@-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (>= ${source:Version}),
- libllvm@LLVM_VERSION@ (<< ${source:Version}.1~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
 Recommends: libclang-rt-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end

From a16e74a8ea18c7355b541b34b65d8bf394e0f27d Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 24 Oct 2023 12:38:11 +0200
Subject: [PATCH 189/349] Update debian/README documentation

---
 debian/README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/README b/debian/README
index aa6d4d2f..b9b0d31b 100644
--- a/debian/README
+++ b/debian/README
@@ -9,13 +9,13 @@ The current snapshot release is maintained in the "snapshot" branch.
 The easiest way to get all branches is probably to have one
 clone per version:
 
-for f in 14 15 snapshot; do
+for f in 14 15 16 17 snapshot; do
     git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f
 done
 
 debian/control is generated from debian/control.in by running:
 
-ebian/rules preconfigure
+debian/rules preconfigure
 
 
 Steps for manually building a snapshot release

From 5577cced669e7993e2916ecdcb386ddf7713136e Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 24 Oct 2023 13:05:49 +0200
Subject: [PATCH 190/349] Upload to experimental

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3ec71bbd..65ed9c7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-16 (1:16.0.6-17exp1) experimental; urgency=medium
+
+  * Fixup the move from all to any
+  * Update debian/README documentation
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 24 Oct 2023 12:38:21 +0200
+
 llvm-toolchain-16 (1:16.0.6-17) unstable; urgency=medium
 
   * Try to fix the wasm path detection (Closes: #1052002)

From 93413979ab0744f4774ad85b88d818c929fdfb0e Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 25 Oct 2023 08:10:50 +0200
Subject: [PATCH 191/349] Set distribution back to sid

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 65ed9c7c..e0fb3b52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium
+
+  * Upload to sid
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 25 Oct 2023 08:10:35 +0200
+
 llvm-toolchain-16 (1:16.0.6-17exp1) experimental; urgency=medium
 
   * Fixup the move from all to any

From 5f371677fee799dca816b05d5721778c284878e4 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 25 Oct 2023 08:36:58 +0200
Subject: [PATCH 192/349] Make it arch:any

---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index b37c5c75..ad287418 100644
--- a/debian/control
+++ b/debian/control
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-17.
 
 Package: libclang-common-17-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (>= ${binary:Version})
 Recommends: libclang-rt-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
diff --git a/debian/control.in b/debian/control.in
index 57b0b378..4f9e1e41 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -166,7 +166,7 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
 Recommends: libclang-rt-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)

From 478cc6d24c10010826c84669d4101dd3c01af959 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 25 Oct 2023 09:39:22 +0200
Subject: [PATCH 193/349] Update patch

---
 debian/patches/wasm/wasm-sysroot-usr.diff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff
index 767ed499..46342231 100644
--- a/debian/patches/wasm/wasm-sysroot-usr.diff
+++ b/debian/patches/wasm/wasm-sysroot-usr.diff
@@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver
  
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
      SmallString<128> P(D.ResourceDir);
-@@ -425,12 +426,20 @@ void WebAssembly::AddClangSystemIncludeA
+@@ -425,12 +426,29 @@ void WebAssembly::AddClangSystemIncludeA
      return;
    }
  

From 55785480660dddeeeffed15df0bd38482ba4fda1 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 31 Oct 2023 22:19:41 +0100
Subject: [PATCH 194/349] * New supstream release * Upload to unstable * New
 snapshot release

---
 debian/changelog | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fd324c0..3dc8a38f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-llvm-toolchain-17 (1:17.0.3-1~exp2) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.4-1) unstable; urgency=medium
 
   [ Matthias Klose ]
   * Limit the number of parallel processes based on the available memory
     and the packages to be built (flang has some memory hogs).
 
- -- Matthias Klose <doko@debian.org>  Wed, 18 Oct 2023 15:00:25 +0200
+  [ Sylvestre Ledru ]
+  * New supstream release
+  * Upload to unstable
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 31 Oct 2023 11:39:22 +0100
 
 llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium
 
@@ -38,6 +42,7 @@ llvm-toolchain-17 (1:17.0.1-1~exp2) experimental; urgency=medium
 llvm-toolchain-17 (1:17.0.1-1~exp1) experimental; urgency=medium
 
   * New upstream release
+  * New snapshot release
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 10:43:02 +0200
 

From 7ab89db8deafc1d009a7b6fdcb705c585bd7d650 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 31 Oct 2023 22:20:03 +0100
Subject: [PATCH 195/349] fix changelog

---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3dc8a38f..8a5382de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,7 +42,6 @@ llvm-toolchain-17 (1:17.0.1-1~exp2) experimental; urgency=medium
 llvm-toolchain-17 (1:17.0.1-1~exp1) experimental; urgency=medium
 
   * New upstream release
-  * New snapshot release
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 19 Sep 2023 10:43:02 +0200
 

From 2840ec0456c215b220fc3ad3bb71ad262bc53a90 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue, 31 Oct 2023 22:54:40 +0100
Subject: [PATCH 196/349] Add noble as supported Ubuntu release

---
 debian/changelog                     |  2 ++
 debian/patches/ubuntu-releases.patch | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0fb3b52..deaa92ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium
 
   * Upload to sid
+  [ Steve Langasek ]
+  * Add noble as supported Ubuntu release
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 25 Oct 2023 08:10:35 +0200
 
diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch
index 8b2bec1c..cc8303ca 100644
--- a/debian/patches/ubuntu-releases.patch
+++ b/debian/patches/ubuntu-releases.patch
@@ -3,36 +3,38 @@ Forwarded: no
 Author: Graham Inggs <ginggs@debian.org>
 Last-Update: 2023-04-29
 
-Index: llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h
+Index: llvm-toolchain-16-16.0.6/clang/include/clang/Driver/Distro.h
 ===================================================================
---- llvm-toolchain-16-16.0.5.orig/clang/include/clang/Driver/Distro.h
-+++ llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h
-@@ -77,6 +77,7 @@
+--- llvm-toolchain-16-16.0.6.orig/clang/include/clang/Driver/Distro.h
++++ llvm-toolchain-16-16.0.6/clang/include/clang/Driver/Distro.h
+@@ -77,6 +77,8 @@
      UbuntuJammy,
      UbuntuKinetic,
      UbuntuLunar,
 +    UbuntuMantic,
++    UbuntuNoble,
      UnknownDistro
    };
  
-@@ -128,7 +129,7 @@
+@@ -128,7 +130,7 @@
    }
  
    bool IsUbuntu() const {
 -    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuLunar;
-+    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
++    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble;
    }
  
    bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
-Index: llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp
+Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/Distro.cpp
 ===================================================================
---- llvm-toolchain-16-16.0.5.orig/clang/lib/Driver/Distro.cpp
-+++ llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp
-@@ -93,6 +93,7 @@
+--- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/Distro.cpp
++++ llvm-toolchain-16-16.0.6/clang/lib/Driver/Distro.cpp
+@@ -93,6 +93,8 @@
                      .Case("jammy", Distro::UbuntuJammy)
                      .Case("kinetic", Distro::UbuntuKinetic)
                      .Case("lunar", Distro::UbuntuLunar)
 +                    .Case("mantic", Distro::UbuntuMantic)
++                    .Case("noble", Distro::UbuntuNoble)
                      .Default(Distro::UnknownDistro);
    return Version;
  }

From 1d1009e59609950d56189d32df2e0caa368e3f6d Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 31 Oct 2023 23:35:25 +0100
Subject: [PATCH 197/349] Do not limit the parallel links on riscv64

The parallel links has been limited to 2 on riscv64 to support the
Ubuntu riscv64 buildds. Now that the number of process is determined
depending on the amount of buildd memory, this is no need anymore.
---
 debian/rules | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index cb65d3f9..f4aa9ac8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,7 +210,6 @@ endif
 # debug symbols OOM in Ubuntu Ubuntu and slows down build process.
 ifneq (,$(filter $(DEB_HOST_ARCH),riscv64))
   opt_flags = -O2 -DNDEBUG -g0
-  STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=2
 else
   opt_flags = -O2 -DNDEBUG -g1
 endif

From 738814be417afcc85fc365d451fb3f44dcb284c7 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Thu, 9 Nov 2023 09:57:13 +0100
Subject: [PATCH 198/349] Don't run chrpath for libclang on sparc and sparc64

---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index deaa92ac..0d1f3df8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium
   [ Steve Langasek ]
   * Add noble as supported Ubuntu release
 
+  [ John Paul Adrian Glaubitz ]
+  * Don't run chrpath for libclang on sparc and sparc64
+
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 25 Oct 2023 08:10:35 +0200
 
 llvm-toolchain-16 (1:16.0.6-17exp1) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index 60fa1d20..ef61242b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1024,7 +1024,7 @@ override_dh_auto_install:
 
 	# Only run on executable, not script
 	chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1`
-ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe))
+ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64))
 ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 	# To fix custom-library-search-path
 	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so

From fecd5d216d993a92c8eac41c7a02a4270cab6de6 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Thu, 9 Nov 2023 10:08:32 +0100
Subject: [PATCH 199/349] Don't run chrpath for libclang on sparc and sparc64

---
 debian/changelog | 7 +++++++
 debian/rules     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 26f668e5..576bcd1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-17 (1:17.0.4-2) UNRELEASED; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Don't run chrpath for libclang on sparc and sparc64
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Thu, 09 Nov 2023 10:07:49 +0100
+
 llvm-toolchain-17 (1:17.0.4-1) unstable; urgency=medium
 
   [ Matthias Klose ]
diff --git a/debian/rules b/debian/rules
index cb65d3f9..e9e93a18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1080,7 +1080,7 @@ override_dh_auto_install:
 
 	# Only run on executable, not script
 	chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1`
-ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe))
+ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64))
 ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 	# To fix custom-library-search-path
 	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so

From 1d6486afa7fa3a1748a734dcd6f7c3ad6f997009 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 10 Nov 2023 13:46:03 +0100
Subject: [PATCH 200/349]   [ Matthias Klose ]   * Build-depend on
 llvm-spirv-17.

---
 debian/changelog  | 3 +++
 debian/control    | 2 +-
 debian/control.in | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 576bcd1b..242266f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ llvm-toolchain-17 (1:17.0.4-2) UNRELEASED; urgency=medium
   [ John Paul Adrian Glaubitz ]
   * Don't run chrpath for libclang on sparc and sparc64
 
+  [ Matthias Klose ]
+  * Build-depend on llvm-spirv-17.
+
  -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Thu, 09 Nov 2023 10:07:49 +0100
 
 llvm-toolchain-17 (1:17.0.4-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ad287418..cd9824a2 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-#    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,
diff --git a/debian/control.in b/debian/control.in
index 4f9e1e41..a80b6eb2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-#    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
+    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,

From 600418a0502e3ce48cc82758da2509548ac61722 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Nov 2023 09:49:30 +0100
Subject: [PATCH 201/349] remove unecessary quotes

---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index ef61242b..83ffd9f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -271,8 +271,8 @@ endif
 LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
 LIBCLC_LLVM_SPIRV =
 ifeq ($(LLVM_SPIRV_INSTALLED),yes)
-	LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-"
-	LIBCLC_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)"
+	LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD);spirv-mesa3d-;spirv64-mesa3d-
+	LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV)
 endif
 
 BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386

From 8b7ecb4ecb3b3ef767eaa76cb46ad43a4a1ca842 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Nov 2023 09:57:06 +0100
Subject: [PATCH 202/349] add debug info

---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 83ffd9f1..9983fc0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -542,6 +542,7 @@ preconfigure:
 	@echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)"
 	@echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)"
 	@echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)"
+	@echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)"
 
 	for f in debian/*.in; do \
 		f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \

From f666a0bd0f7f3ee59e99db8696e86f432db60201 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Nov 2023 09:58:34 +0100
Subject: [PATCH 203/349] Do not build spirv features on bookworm as the spirv
 compiler is too old: FAILED: spirv-mesa3d-.spv
 /build/source/libclc/build/spirv-mesa3d-.spv cd /build/source/libclc/build &&
 /usr/bin/llvm-spirv-15 --spirv-max-version=1.1 -o spirv-mesa3d-.spv
 builtins.link.spirv-mesa3d-.bc Unknown attribute kind (86) (Producer:
 'LLVM16.0.6' Reader: 'LLVM 15.0.6')

---
 debian/changelog | 15 ++++++++++++++-
 debian/rules     |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d1f3df8..c49c4b98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,26 @@
 llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium
 
+  [ Gianfranco Costamagna ]
   * Upload to sid
+
+  [ Sylvestre Ledru ]
+  * Do not build spirv features on bookworm as the spirv compiler
+    is too old:
+    FAILED: spirv-mesa3d-.spv /build/source/libclc/build/spirv-mesa3d-.spv
+    cd /build/source/libclc/build && /usr/bin/llvm-spirv-15
+       --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc
+    Unknown attribute kind (86) (Producer: 'LLVM16.0.6' Reader: 'LLVM 15.0.6')
+
+
   [ Steve Langasek ]
   * Add noble as supported Ubuntu release
 
   [ John Paul Adrian Glaubitz ]
   * Don't run chrpath for libclang on sparc and sparc64
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 25 Oct 2023 08:10:35 +0200
+  [ Sylvestre Ledru ]
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 11 Nov 2023 09:57:35 +0100
 
 llvm-toolchain-16 (1:16.0.6-17exp1) experimental; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 9983fc0c..c58bbda6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -260,7 +260,7 @@ endif
 ifndef LLVM_SPIRV
 	LLVM_SPIRV_INSTALLED = no
 else
-	ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 14.0.0 ; echo $$?),0)
+	ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 15.0.0 ; echo $$?),0)
 # Too old llvm-spirv version are failing. See #52200
 		LLVM_SPIRV_INSTALLED = yes
 	else

From d7a2adfa6227a4f6f08d326d694f39f0730f7951 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Nov 2023 09:58:56 +0100
Subject: [PATCH 204/349] prepare upload

---
 debian/changelog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c49c4b98..2f420db3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Upload to sid
@@ -11,7 +11,6 @@ llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium
        --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc
     Unknown attribute kind (86) (Producer: 'LLVM16.0.6' Reader: 'LLVM 15.0.6')
 
-
   [ Steve Langasek ]
   * Add noble as supported Ubuntu release
 

From 3975016630840eb5c4933e404882de86f3c3e53b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Nov 2023 10:53:12 +0100
Subject: [PATCH 205/349] For Ubuntu bionic, improve the deactivation of lldb
 python

---
 debian/changelog | 1 +
 debian/rules     | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2f420db3..93e8c44e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium
     cd /build/source/libclc/build && /usr/bin/llvm-spirv-15
        --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc
     Unknown attribute kind (86) (Producer: 'LLVM16.0.6' Reader: 'LLVM 15.0.6')
+  * For Ubuntu bionic, improve the deactivation of lldb python
 
   [ Steve Langasek ]
   * Add noble as supported Ubuntu release
diff --git a/debian/rules b/debian/rules
index c58bbda6..20eb11af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -399,9 +399,13 @@ else
 	PROJECTS+=;lldb
 endif
 
-ifneq (,$(filter $(DISTRO),buster))
+LLDB_PYTHON_DISABLE_DISTRO := bionic buster
+LLDB_PYTHON_ENABLE=yes
+# Disable zstd on old distro, fails on lld
+ifeq (,$(filter-out $(LLDB_PYTHON_DISABLE_DISTRO), $(DISTRO)))
 # Don't enable lld python for old distros
   STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_PYTHON=OFF
+  LLDB_PYTHON_ENABLE=no
 endif
 
 LIBCXX_WASM_ENABLE=yes
@@ -1201,6 +1205,8 @@ endif
 	if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \
 		mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \
 		touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
+	fi
+	if test "$(LLDB_PYTHON_ENABLE)" = no; then \
 		echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \
 	fi
 

From 80a169f8c2377ac39817cfd9aba8bda17a2ac2e6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Nov 2023 11:03:48 +0100
Subject: [PATCH 206/349]  fix the space syntax

---
 debian/rules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 20eb11af..d4b9b8e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -257,6 +257,7 @@ ifndef LLVM_SPIRV
 	LLVM_SPIRV_VERSION := $(shell expr $(LLVM_VERSION) - 1)
 	LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null)
 endif
+
 ifndef LLVM_SPIRV
 	LLVM_SPIRV_INSTALLED = no
 else
@@ -268,7 +269,7 @@ else
 	endif
 endif
 
-LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
+LIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl
 LIBCLC_LLVM_SPIRV =
 ifeq ($(LLVM_SPIRV_INSTALLED),yes)
 	LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD);spirv-mesa3d-;spirv64-mesa3d-

From 056802f7cd51308532d8f216f9bee6e4cf156138 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Nov 2023 19:27:27 +0100
Subject: [PATCH 207/349] Change the logic to disable SPIRV. Disable it on most
 of the versions because it needs llvm-spirv-16. Enabled on trixie/sid, Ubuntu
 Mantic

---
 debian/changelog |  5 +++--
 debian/rules     | 11 ++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93e8c44e..e4a7373e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium
   * Upload to sid
 
   [ Sylvestre Ledru ]
-  * Do not build spirv features on bookworm as the spirv compiler
-    is too old:
+  * Change the logic to disable SPIRV. Disable it on most of the versions because
+    it needs llvm-spirv-16.
+    Enabled on trixie/sid, Ubuntu Mantic
     FAILED: spirv-mesa3d-.spv /build/source/libclc/build/spirv-mesa3d-.spv
     cd /build/source/libclc/build && /usr/bin/llvm-spirv-15
        --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc
diff --git a/debian/rules b/debian/rules
index d4b9b8e2..8d8d034a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -258,14 +258,18 @@ ifndef LLVM_SPIRV
 	LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null)
 endif
 
+# Disable spirv support for most of the distro versions
+# It needs llvm-spirv-16 and it is rarely available
+# Be prescritive
+SPIRV_DISABLE_DISTRO := bionic buster lunar jammy focal buster bullseye bookworm
 ifndef LLVM_SPIRV
 	LLVM_SPIRV_INSTALLED = no
 else
-	ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 15.0.0 ; echo $$?),0)
+	ifeq (,$(filter-out $(SPIRV_DISABLE_DISTRO), $(DISTRO)))
 # Too old llvm-spirv version are failing. See #52200
-		LLVM_SPIRV_INSTALLED = yes
-	else
 		LLVM_SPIRV_INSTALLED = no
+	else
+		LLVM_SPIRV_INSTALLED = yes
 	endif
 endif
 
@@ -547,6 +551,7 @@ preconfigure:
 	@echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)"
 	@echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)"
 	@echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)"
+	@echo "LLVM_SPIRV=$(LLVM_SPIRV)"
 	@echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)"
 
 	for f in debian/*.in; do \

From 43c7b3b296b647932806dc4f82dfce698c423a97 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 11 Nov 2023 20:09:55 +0100
Subject: [PATCH 208/349] disable spv files too

---
 debian/rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8d8d034a..53d6bfca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -577,12 +577,12 @@ preconfigure:
 		debian/llvm-$(LLVM_VERSION)-linker-tools.links \
 		debian/libbolt-$(LLVM_VERSION)-dev.install
 
-ifdef LLVM_SPIRV
 	# llvm-spirv was found, so we can enable *.spv files. Debian
 	# buster and Ubuntu 18.04 don't have llvm-spirv to create the
 	# *.spv files.
-	sed -i -e "s|#spv\ ||g" debian/libclc-$(LLVM_VERSION).install
-endif
+	if test "$(LLVM_SPIRV_INSTALLED)" = "no"; then \
+		sed -i -e "s|#spv\ ||g" debian/libclc-$(LLVM_VERSION).install; \
+	fi
 
 	# disable libc++-X.Y-dev-wasm32.install.in on old distro
 	if test "$(LIBCXX_WASM_ENABLE)" = "no"; then \

From ff67b0586979bccf862bd2d5ea6cc4175c281c31 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 12 Nov 2023 09:43:04 +0100
Subject: [PATCH 209/349] fix the check

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 53d6bfca..3827c0f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -580,7 +580,7 @@ preconfigure:
 	# llvm-spirv was found, so we can enable *.spv files. Debian
 	# buster and Ubuntu 18.04 don't have llvm-spirv to create the
 	# *.spv files.
-	if test "$(LLVM_SPIRV_INSTALLED)" = "no"; then \
+	if test "$(LLVM_SPIRV_INSTALLED)" = "yes"; then \
 		sed -i -e "s|#spv\ ||g" debian/libclc-$(LLVM_VERSION).install; \
 	fi
 

From fe997716a1735cfac649a25c252bad302cec762f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 12 Nov 2023 12:24:32 +0100
Subject: [PATCH 210/349] fix the declaration for the archs

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 3827c0f5..79ac1d6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -798,7 +798,7 @@ debian-libclc-build:
 	-DCMAKE_INSTALL_INCLUDEDIR=include \
 	-DLLVM_CMAKE_DIR=$(STAGE_2_BIN_DIR)/../ \
 	$(LIBCLC_LLVM_SPIRV) \
-	-DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \
+	-DLIBCLC_TARGETS_TO_BUILD="$(LIBCLC_TARGETS_TO_BUILD)"; \
 	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(STAGE_2_LIB_DIR) ninja -j $(NJOBS) $(VERBOSE)
 ifndef LLVM_SPIRV
 	echo "libclc built without SPIRV (.spv) outputs because llvm-spirv wasn't found"

From 3958b1793d37183267a6742792ed944f04cbec1c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 13 Nov 2023 21:56:18 +0100
Subject: [PATCH 211/349] try to relax the wasi-libc dep

maybe fix:

 builddeps:/build/llvm-toolchain-16_16.0.6~++20231112100454+7cbf1a259152-1~exp1~20231112100542.111.dsc : Depends: wasi-libc but it is not installable
---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 1536aeb4..5dd3a460 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     llvm-spirv-15 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
     llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello,
     spirv-tools [ linux-any ] | hello [ !i386],
-    wasi-libc | hello [ !any-i386],
+    wasi-libc | hello,
     libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
     protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
diff --git a/debian/control.in b/debian/control.in
index 0fa0ac04..fbcb2ab8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     llvm-spirv-15 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
     llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello,
     spirv-tools [ linux-any ] | hello [ !i386],
-    wasi-libc | hello [ !any-i386],
+    wasi-libc | hello,
     libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
     protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],

From c747f322da1bfda56168e72c9b4240a52e818940 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 15 Nov 2023 17:54:36 +0100
Subject: [PATCH 212/349] Further limit the number of parallel processes

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 31433ceb..0524aa63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ packages := $(shell dh_listpackages)
 # flang has some memory hogs, of up to 6.2gb per process. Limit the parallel jobs
 # based on the available memory
 ifneq (,$(filter flang-$(LLVM_VERSION), $(packages)))
-  MEM_PER_CPU=3900
+  MEM_PER_CPU=4500
 else
   MEM_PER_CPU=2100
 endif

From 02bfadc696c39c5b7dc25303cbffc77aa1b28d54 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 15 Nov 2023 17:54:44 +0100
Subject: [PATCH 213/349] Update changelog

---
 debian/changelog | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e52d9c81..9b3471e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-llvm-toolchain-17 (1:17.0.4-2) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
+
+  [ Matthias Klose ]
+  * Further limit the number of parallel processes
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 15 Nov 2023 17:26:48 +0100
+
+llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
   * Don't run chrpath for libclang on sparc and sparc64
@@ -6,7 +13,10 @@ llvm-toolchain-17 (1:17.0.4-2) UNRELEASED; urgency=medium
   [ Matthias Klose ]
   * Build-depend on llvm-spirv-17.
 
- -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Thu, 09 Nov 2023 10:07:49 +0100
+  [ Sylvestre Ledru ]
+  * New supstream release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 14 Nov 2023 11:27:22 +0100
 
 llvm-toolchain-17 (1:17.0.4-1) unstable; urgency=medium
 

From 4c24440f8713e1ec1ef2ff67527dd90f85f4604e Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 17 Nov 2023 08:44:12 +0100
Subject: [PATCH 214/349]   * Don't build-depend on llvm-spirv-17 on armel and
 mipsel (LLVM 17 is not     yet built on these architectures).

---
 debian/changelog  | 2 ++
 debian/control    | 5 +++--
 debian/control.in | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b3471e2..2bc71001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
 
   [ Matthias Klose ]
   * Further limit the number of parallel processes
+  * Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not
+    yet built on these architectures).
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 15 Nov 2023 17:26:48 +0100
 
diff --git a/debian/control b/debian/control
index cd9824a2..c6272ae3 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,9 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
-    spirv-tools [ linux-any ] | hello [ !i386],
+#    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
+    llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
+    spirv-tools [linux-any] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
diff --git a/debian/control.in b/debian/control.in
index a80b6eb2..efc07998 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -23,8 +23,9 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
-    spirv-tools [ linux-any ] | hello [ !i386],
+#    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
+    llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
+    spirv-tools [linux-any] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],

From cce043eec0e0a253b21da06ef03c5f996e742036 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 17 Nov 2023 08:56:12 +0100
Subject: [PATCH 215/349] Fix typos

---
 debian/changelog | 2 +-
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2bc71001..5cbffbdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
   * Build-depend on llvm-spirv-17.
 
   [ Sylvestre Ledru ]
-  * New supstream release
+  * New upstream release
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 14 Nov 2023 11:27:22 +0100
 
diff --git a/debian/rules b/debian/rules
index 0524aa63..3a3c8039 100755
--- a/debian/rules
+++ b/debian/rules
@@ -274,7 +274,7 @@ ifndef LLVM_SPIRV
 endif
 
 # Disable spirv support for most of the distro versions
-# It needs llvm-spirv-16 and it is rarely available
+# It needs llvm-spirv-17 and it is rarely available
 # Be prescritive
 SPIRV_DISABLE_DISTRO := bionic buster lunar jammy focal buster bullseye bookworm
 ifndef LLVM_SPIRV

From bb235b3c7ec68f064e265fc9eaa9a0228698a307 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 17 Nov 2023 00:07:08 +0100
Subject: [PATCH 216/349] try to fix #1052002 again

---
 debian/patches/wasm/wasm-sysroot-usr.diff | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff
index 0df6ce9e..226d0c8b 100644
--- a/debian/patches/wasm/wasm-sysroot-usr.diff
+++ b/debian/patches/wasm/wasm-sysroot-usr.diff
@@ -19,7 +19,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
  
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
      SmallString<128> P(D.ResourceDir);
-@@ -425,12 +426,29 @@ void WebAssembly::AddClangSystemIncludeA
+@@ -425,12 +426,33 @@ void WebAssembly::AddClangSystemIncludeA
      return;
    }
  
@@ -28,8 +28,6 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
      const std::string MultiarchTriple =
 -        getMultiarchTriple(D, getTriple(), D.SysRoot);
 -    addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include/" + MultiarchTriple);
--  }
--  addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
 +        getMultiarchTriple(D, getTriple(), SysRoot);
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/local/include/" + MultiarchTriple);
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/local/include");
@@ -43,7 +41,12 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
 +		// Third the backward one.
 +		addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
 +	}
-+  }
++
++	// Hardcode the path for bug #1052002
++	addSystemInclude(DriverArgs, CC1Args, "/usr/include/wasm32-wasi/c++/v1");
++
+   }
+-  addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
 +
 +  // also add the non-multiarch path, only on a known OS (as above), or when
 +  // a sysroot is given, for backwards compatibility with the original driver
@@ -53,7 +56,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
  }
  
  void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
-@@ -478,6 +496,17 @@ Tool *WebAssembly::buildLinker() const {
+@@ -478,6 +500,17 @@ Tool *WebAssembly::buildLinker() const {
    return new tools::wasm::Linker(*this);
  }
  
@@ -71,7 +74,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
  void WebAssembly::addLibCxxIncludePaths(
      const llvm::opt::ArgList &DriverArgs,
      llvm::opt::ArgStringList &CC1Args) const {
-@@ -499,7 +528,9 @@ void WebAssembly::addLibCxxIncludePaths(
+@@ -499,7 +532,9 @@ void WebAssembly::addLibCxxIncludePaths(
    }
  
    // Second add the generic one.
@@ -82,7 +85,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
  }
  
  void WebAssembly::addLibStdCXXIncludePaths(
-@@ -546,8 +577,11 @@ void WebAssembly::addLibStdCXXIncludePat
+@@ -546,8 +581,11 @@ void WebAssembly::addLibStdCXXIncludePat
      addSystemInclude(DriverArgs, CC1Args, TargetDir);
    }
  

From 945e440f92483a44d49b52511940d2cee6816abc Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 18 Nov 2023 14:38:25 +0100
Subject: [PATCH 217/349] Make libc++-16-dev-wasm32 depends on libc++-16-dev
 (Closes: #1052002)

---
 debian/changelog  | 3 +--
 debian/control    | 3 ++-
 debian/control.in | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4a7373e..41e2ad8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium
        --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc
     Unknown attribute kind (86) (Producer: 'LLVM16.0.6' Reader: 'LLVM 15.0.6')
   * For Ubuntu bionic, improve the deactivation of lldb python
+  * Make libc++-16-dev-wasm32 depends on libc++-16-dev (Closes: #1052002)
 
   [ Steve Langasek ]
   * Add noble as supported Ubuntu release
@@ -19,8 +20,6 @@ llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium
   [ John Paul Adrian Glaubitz ]
   * Don't run chrpath for libclang on sparc and sparc64
 
-  [ Sylvestre Ledru ]
-
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 11 Nov 2023 09:57:35 +0100
 
 llvm-toolchain-16 (1:16.0.6-17exp1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 5dd3a460..195a1aae 100644
--- a/debian/control
+++ b/debian/control
@@ -711,7 +711,8 @@ Package: libc++-16-dev-wasm32
 Section: libdevel
 Architecture: all
 Multi-Arch: foreign
-Depends: wasi-libc, libc++abi-16-dev-wasm32, ${misc:Depends}
+Depends: wasi-libc, libc++abi-16-dev-wasm32, ${misc:Depends},
+ libc++-16-dev
 Provides: libc++-x.y-dev-wasm32
 Conflicts: libc++-x.y-dev-wasm32
 Replaces: libc++-x.y-dev-wasm32
diff --git a/debian/control.in b/debian/control.in
index fbcb2ab8..8218a7ef 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -711,7 +711,8 @@ Package: libc++-@LLVM_VERSION@-dev-wasm32
 Section: libdevel
 Architecture: all
 Multi-Arch: foreign
-Depends: wasi-libc, libc++abi-@LLVM_VERSION@-dev-wasm32, ${misc:Depends}
+Depends: wasi-libc, libc++abi-@LLVM_VERSION@-dev-wasm32, ${misc:Depends},
+ libc++-@LLVM_VERSION@-dev
 Provides: libc++-x.y-dev-wasm32
 Conflicts: libc++-x.y-dev-wasm32
 Replaces: libc++-x.y-dev-wasm32

From 4e522af7c850c49aa9122405fa7d8159d11da94f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 20 Nov 2023 19:35:31 +0100
Subject: [PATCH 218/349] Add a symlink for libc++experimental.a to
 /usr/lib/*/libc++experimental.a to fix
 https://github.com/llvm/llvm-project/issues/72753

---
 debian/changelog                  | 6 +++++-
 debian/libc++abi-X.Y-dev.links.in | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5cbffbdd..4e15b57a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,11 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
   * Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not
     yet built on these architectures).
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 15 Nov 2023 17:26:48 +0100
+  [ Sylvestre Ledru ]
+  * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
+    to fix https://github.com/llvm/llvm-project/issues/72753
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 20 Nov 2023 19:34:35 +0100
 
 llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
diff --git a/debian/libc++abi-X.Y-dev.links.in b/debian/libc++abi-X.Y-dev.links.in
index 6dd5f555..e1814c9b 100644
--- a/debian/libc++abi-X.Y-dev.links.in
+++ b/debian/libc++abi-X.Y-dev.links.in
@@ -1 +1,2 @@
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a /usr/lib/@DEB_HOST_MULTIARCH@/libc++experimental.a

From edfb1e171ef54496eacdc9a3307b1f0948460385 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 22 Nov 2023 00:21:48 +0100
Subject: [PATCH 219/349] relax the wasi-libc dep declaration

---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index c6272ae3..e7cbb886 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
 #    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
     llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
     spirv-tools [linux-any] | hello [ !i386],
-    wasi-libc | hello [ !any-i386],
+    wasi-libc | hello,
     libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
     protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
diff --git a/debian/control.in b/debian/control.in
index efc07998..90a72843 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
 #    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
     llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
     spirv-tools [linux-any] | hello [ !i386],
-    wasi-libc | hello [ !any-i386],
+    wasi-libc | hello,
     libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
     protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],

From cfffa8ace2a2fa3f2d6dceb57144d2f45c261b28 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 22 Nov 2023 00:22:06 +0100
Subject: [PATCH 220/349] refresh debian/control with control.in changes

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e7cbb886..de5daf26 100644
--- a/debian/control
+++ b/debian/control
@@ -169,7 +169,7 @@ Description: Clang library - Development package
 Package: libclang-common-17-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (>= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
 Recommends: libclang-rt-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end

From 789660216a3c8dfd9eb35cb0bb813120914cd7a4 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 22 Nov 2023 00:22:34 +0100
Subject: [PATCH 221/349] try to relax the wasi-libc dep declaration for
 apt.llvm.org

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 4e15b57a..c19414ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
   [ Sylvestre Ledru ]
   * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
     to fix https://github.com/llvm/llvm-project/issues/72753
+  * try to relax the wasi-libc dep declaration for apt.llvm.org
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 20 Nov 2023 19:34:35 +0100
 

From 363182564fde6bf322ca81c571ac070a7ba2d90e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 22 Nov 2023 00:29:57 +0100
Subject: [PATCH 222/349] add a check that, if we are going to build wasm,
 wasi-libc is installed on the system

---
 debian/changelog | 2 ++
 debian/rules     | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c19414ca..ab4a95bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
   * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
     to fix https://github.com/llvm/llvm-project/issues/72753
   * try to relax the wasi-libc dep declaration for apt.llvm.org
+  * add a check that, if we are going to build wasm, wasi-libc is installed
+    on the system
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 20 Nov 2023 19:34:35 +0100
 
diff --git a/debian/rules b/debian/rules
index 3a3c8039..6a8accb3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -628,6 +628,12 @@ stamps/preconfigure:
 	if test "$(LIBCXX_WASM_ENABLE)" = "no"; then \
 		echo "" > debian/libc++-$(LLVM_VERSION)-dev-wasm32.install; \
 		echo "" > debian/libc++abi-$(LLVM_VERSION)-dev-wasm32.install; \
+	else; \
+		if ! dpkg -l|grep -q wasi-libc; then \
+			echo "Could not find wasi-libc on the system"; \
+			echo "Please check that the package is available on the system"; \
+			exit 1; \
+		fi; \
 	fi
 
 	# Conditionally enable install clangd grpc files

From a747b6c7849947920f9fc66b6a5dd771e5e868d2 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 14 Nov 2023 11:27:35 +0100
Subject: [PATCH 223/349] * New supstream release * New snapshot release

---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ab4a95bc..f805e407 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
 
 llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
+<<<<<<<
   [ John Paul Adrian Glaubitz ]
   * Don't run chrpath for libclang on sparc and sparc64
 
@@ -24,6 +25,16 @@ llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
   * New upstream release
+=======
+  [ John Paul Adrian Glaubitz ]
+  * Don't run chrpath for libclang on sparc and sparc64
+
+  [ Matthias Klose ]
+  * Build-depend on llvm-spirv-17.
+
+  [ Sylvestre Ledru ]
+  * New supstream release
+>>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 14 Nov 2023 11:27:22 +0100
 

From 0c09647cd079d5a7550716f5a715e4a082a36abb Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 22 Nov 2023 09:18:06 +0100
Subject: [PATCH 224/349] fix syntax

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 6a8accb3..e31f5abc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -628,7 +628,7 @@ stamps/preconfigure:
 	if test "$(LIBCXX_WASM_ENABLE)" = "no"; then \
 		echo "" > debian/libc++-$(LLVM_VERSION)-dev-wasm32.install; \
 		echo "" > debian/libc++abi-$(LLVM_VERSION)-dev-wasm32.install; \
-	else; \
+	else \
 		if ! dpkg -l|grep -q wasi-libc; then \
 			echo "Could not find wasi-libc on the system"; \
 			echo "Please check that the package is available on the system"; \

From 19fe78dea03cc9e79a3a1e1daf8d68671d46d0f5 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 22 Nov 2023 10:36:34 +0100
Subject: [PATCH 225/349] fix conflict

---
 debian/changelog | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f805e407..ab4a95bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,6 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
 
 llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
-<<<<<<<
   [ John Paul Adrian Glaubitz ]
   * Don't run chrpath for libclang on sparc and sparc64
 
@@ -25,16 +24,6 @@ llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
   * New upstream release
-=======
-  [ John Paul Adrian Glaubitz ]
-  * Don't run chrpath for libclang on sparc and sparc64
-
-  [ Matthias Klose ]
-  * Build-depend on llvm-spirv-17.
-
-  [ Sylvestre Ledru ]
-  * New supstream release
->>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 14 Nov 2023 11:27:22 +0100
 

From b5ccb8c06ff55b43a203c006996b04f3bddce9ff Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 22 Nov 2023 17:02:14 +0100
Subject: [PATCH 226/349] Drop extra spaces

---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index de5daf26..05127efc 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
 #    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
     llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
-    spirv-tools [linux-any] | hello [ !i386],
+    spirv-tools [linux-any] | hello [!i386],
     wasi-libc | hello,
     libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
diff --git a/debian/control.in b/debian/control.in
index 90a72843..73e8d1d8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
 #    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
     llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
-    spirv-tools [linux-any] | hello [ !i386],
+    spirv-tools [linux-any] | hello [!i386],
     wasi-libc | hello,
     libcurl4-openssl-dev | libcurl-dev,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],

From a7ae059e081b74e70cf09439df40586b8e7dda47 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 22 Nov 2023 23:08:28 +0100
Subject: [PATCH 227/349] explain how to debug the issue

---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index e31f5abc..7b8438cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -632,6 +632,7 @@ stamps/preconfigure:
 		if ! dpkg -l|grep -q wasi-libc; then \
 			echo "Could not find wasi-libc on the system"; \
 			echo "Please check that the package is available on the system"; \
+			echo "it might be that the 'hello' package is installed by another constraint"; \
 			exit 1; \
 		fi; \
 	fi

From 35076f5af3efb3fcec33960a175cb1cb377ead4d Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Thu, 23 Nov 2023 09:45:14 +0100
Subject: [PATCH 228/349]   * Fix stripping build flags on Ubuntu/ppc64el.

---
 debian/changelog |  1 +
 debian/rules     | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab4a95bc..1a862485 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
   * Further limit the number of parallel processes
   * Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not
     yet built on these architectures).
+  * Fix stripping build flags on Ubuntu/ppc64el.
 
   [ Sylvestre Ledru ]
   * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
diff --git a/debian/rules b/debian/rules
index 7b8438cd..0641f0ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,9 +65,13 @@ CONFIGURE_EXTRA =
 # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
 export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
 # these are handled on a per stage / build basis
-export DEB_CFLAGS_MAINT_STRIP = -g -O2
-export DEB_CXXFLAGS_MAINT_STRIP = -g -O2
-
+ifeq ($(VENDOR)-$(DEB_HOST_ARCH),Ubuntu-ppc64el)
+  export DEB_CFLAGS_MAINT_STRIP = -g -O3
+  export DEB_CXXFLAGS_MAINT_STRIP = -g -O3
+else
+  export DEB_CFLAGS_MAINT_STRIP = -g -O2
+  export DEB_CXXFLAGS_MAINT_STRIP = -g -O2
+endif
 include /usr/share/dpkg/buildflags.mk
 
 # We use a stage2 build. It means that a first clang is built using gcc,

From aba513285a8e6db7b913fc925a40eb6c8a64dfa4 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 23 Nov 2023 15:00:16 +0100
Subject: [PATCH 229/349] Revert "Make libc++-16-dev-wasm32 depends on
 libc++-16-dev (Closes: #1052002)"

This reverts commit 945e440f92483a44d49b52511940d2cee6816abc.
---
 debian/changelog  | 3 ++-
 debian/control    | 3 +--
 debian/control.in | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 41e2ad8c..e4a7373e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,6 @@ llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium
        --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc
     Unknown attribute kind (86) (Producer: 'LLVM16.0.6' Reader: 'LLVM 15.0.6')
   * For Ubuntu bionic, improve the deactivation of lldb python
-  * Make libc++-16-dev-wasm32 depends on libc++-16-dev (Closes: #1052002)
 
   [ Steve Langasek ]
   * Add noble as supported Ubuntu release
@@ -20,6 +19,8 @@ llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium
   [ John Paul Adrian Glaubitz ]
   * Don't run chrpath for libclang on sparc and sparc64
 
+  [ Sylvestre Ledru ]
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 11 Nov 2023 09:57:35 +0100
 
 llvm-toolchain-16 (1:16.0.6-17exp1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 195a1aae..5dd3a460 100644
--- a/debian/control
+++ b/debian/control
@@ -711,8 +711,7 @@ Package: libc++-16-dev-wasm32
 Section: libdevel
 Architecture: all
 Multi-Arch: foreign
-Depends: wasi-libc, libc++abi-16-dev-wasm32, ${misc:Depends},
- libc++-16-dev
+Depends: wasi-libc, libc++abi-16-dev-wasm32, ${misc:Depends}
 Provides: libc++-x.y-dev-wasm32
 Conflicts: libc++-x.y-dev-wasm32
 Replaces: libc++-x.y-dev-wasm32
diff --git a/debian/control.in b/debian/control.in
index 8218a7ef..fbcb2ab8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -711,8 +711,7 @@ Package: libc++-@LLVM_VERSION@-dev-wasm32
 Section: libdevel
 Architecture: all
 Multi-Arch: foreign
-Depends: wasi-libc, libc++abi-@LLVM_VERSION@-dev-wasm32, ${misc:Depends},
- libc++-@LLVM_VERSION@-dev
+Depends: wasi-libc, libc++abi-@LLVM_VERSION@-dev-wasm32, ${misc:Depends}
 Provides: libc++-x.y-dev-wasm32
 Conflicts: libc++-x.y-dev-wasm32
 Replaces: libc++-x.y-dev-wasm32

From a08d0eae33e60cbf8985f47a7fe074f9f8349419 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 23 Nov 2023 16:28:21 +0100
Subject: [PATCH 230/349] Revert my ugly fix for 1052002.

---
 debian/changelog                          |  9 +++++
 debian/patches/wasm/wasm-sysroot-usr.diff | 44 +++++++++++++----------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4a7373e..cb84ad66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+llvm-toolchain-16 (1:16.0.6-19) UNRELEASED; urgency=medium
+
+  * Revert my ugly fix for 1052002.
+
+  [ Faidon Liambotis ]
+  * Improve the fix for the bug 1052002.
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 23 Nov 2023 16:27:52 +0100
+
 llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff
index 226d0c8b..b3bbf565 100644
--- a/debian/patches/wasm/wasm-sysroot-usr.diff
+++ b/debian/patches/wasm/wasm-sysroot-usr.diff
@@ -19,7 +19,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
  
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
      SmallString<128> P(D.ResourceDir);
-@@ -425,12 +426,33 @@ void WebAssembly::AddClangSystemIncludeA
+@@ -425,12 +426,20 @@ void WebAssembly::AddClangSystemIncludeA
      return;
    }
  
@@ -32,19 +32,6 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/local/include/" + MultiarchTriple);
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/local/include");
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/include/" + MultiarchTriple);
-+	std::string LibPath = SysRoot	+ "/include";
-+	std::string Version = detectLibcxxVersion(LibPath);
-+
-+	if (!getDriver().SysRoot.empty()) {
-+		// Second add the generic one.
-+		addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
-+		// Third the backward one.
-+		addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
-+	}
-+
-+	// Hardcode the path for bug #1052002
-+	addSystemInclude(DriverArgs, CC1Args, "/usr/include/wasm32-wasi/c++/v1");
-+
    }
 -  addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
 +
@@ -56,7 +43,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
  }
  
  void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
-@@ -478,6 +500,17 @@ Tool *WebAssembly::buildLinker() const {
+@@ -478,6 +487,17 @@ Tool *WebAssembly::buildLinker() const {
    return new tools::wasm::Linker(*this);
  }
  
@@ -74,18 +61,37 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
  void WebAssembly::addLibCxxIncludePaths(
      const llvm::opt::ArgList &DriverArgs,
      llvm::opt::ArgStringList &CC1Args) const {
-@@ -499,7 +532,9 @@ void WebAssembly::addLibCxxIncludePaths(
+@@ -488,18 +508,22 @@ void WebAssembly::addLibCxxIncludePaths(
+       getMultiarchTriple(D, getTriple(), SysRoot);
+   bool IsKnownOs = (getTriple().getOS() != llvm::Triple::UnknownOS);
+ 
+-  std::string Version = detectLibcxxVersion(LibPath);
+-  if (Version.empty())
+-    return;
+-
+   // First add the per-target include path if the OS is known.
+   if (IsKnownOs) {
+-    std::string TargetDir = LibPath + "/" + MultiarchTriple + "/c++/" + Version;
+-    addSystemInclude(DriverArgs, CC1Args, TargetDir);
++    std::string Version = detectLibcxxVersion(LibPath + "/" + MultiarchTriple);
++    if (!Version.empty()) {
++      std::string TargetDir = LibPath + "/" + MultiarchTriple + "/c++/" + Version;
++      addSystemInclude(DriverArgs, CC1Args, TargetDir);
++    }
    }
  
    // Second add the generic one.
 -  addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
 +  // don't include the host architecture's headers in the search path
-+  if (!getDriver().SysRoot.empty())
-+    addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
++  if (!getDriver().SysRoot.empty()) {
++    std::string Version = detectLibcxxVersion(LibPath);
++    if (!Version.empty())
++      addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
++  }
  }
  
  void WebAssembly::addLibStdCXXIncludePaths(
-@@ -546,8 +581,11 @@ void WebAssembly::addLibStdCXXIncludePat
+@@ -546,8 +570,11 @@ void WebAssembly::addLibStdCXXIncludePat
      addSystemInclude(DriverArgs, CC1Args, TargetDir);
    }
  

From bedd3e711b2a7dbbc3c74e3eb43aaa514146eaf2 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 23 Nov 2023 17:46:37 +0100
Subject: [PATCH 231/349] prepare upload

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cb84ad66..b30b964e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-16 (1:16.0.6-19) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-19) unstable; urgency=medium
 
   * Revert my ugly fix for 1052002.
 

From d2e2ed9cdb4b65a6d609a1931ac00de4956bab24 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 23 Nov 2023 23:57:36 +0100
Subject: [PATCH 232/349] llvm-spirv-17: fix 'llvm-spirv-17 but it is not
 installable' on i386

---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 05127efc..b2b699c9 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
 #    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
-    llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
+    llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello,
     spirv-tools [linux-any] | hello [!i386],
     wasi-libc | hello,
     libcurl4-openssl-dev | libcurl-dev,
diff --git a/debian/control.in b/debian/control.in
index 73e8d1d8..e8ae25cb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
 #    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
-    llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
+    llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello,
     spirv-tools [linux-any] | hello [!i386],
     wasi-libc | hello,
     libcurl4-openssl-dev | libcurl-dev,

From 5cda29f50904e3c99bd831157ac8fce29fbf04ca Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 24 Nov 2023 17:45:03 +0100
Subject: [PATCH 233/349]   * libclang1-17: Only encode the major version in
 the soname. Closes: #1056126.

---
 debian/changelog                                |  1 +
 debian/libclang-X.Y-dev.links.in                |  6 +++---
 debian/libclang1-X.Y.links.in                   |  6 +++---
 debian/libclang1-X.Y.symbols.in                 |  2 +-
 debian/patches/libclang-major-version-only.diff | 11 +++++++++++
 debian/patches/series                           |  1 +
 debian/rules                                    |  4 ++++
 7 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 debian/patches/libclang-major-version-only.diff

diff --git a/debian/changelog b/debian/changelog
index 1a862485..da975607 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
   * Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not
     yet built on these architectures).
   * Fix stripping build flags on Ubuntu/ppc64el.
+  * libclang1-17: Only encode the major version in the soname. Closes: #1056126.
 
   [ Sylvestre Ledru ]
   * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
diff --git a/debian/libclang-X.Y-dev.links.in b/debian/libclang-X.Y-dev.links.in
index a82e6089..7cd10c4d 100644
--- a/debian/libclang-X.Y-dev.links.in
+++ b/debian/libclang-X.Y-dev.links.in
@@ -1,3 +1,3 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so
-usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so
-usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so
+usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so
+usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so
+usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so
diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in
index dc4b7a44..f735225c 100644
--- a/debian/libclang1-X.Y.links.in
+++ b/debian/libclang1-X.Y.links.in
@@ -1,4 +1,4 @@
 # as upstream
-usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1
-usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
-usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@
+usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in
index 49724304..2f07205d 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Y.symbols.in
@@ -1,4 +1,4 @@
-libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER#
+libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
  (optional)LLVM_13@LLVM_13 1:15.0.7-3
  (optional)LLVM_16@LLVM_16 1:16.0.2-1
  (optional)LLVM_17@LLVM_17 1:17.0.1-1
diff --git a/debian/patches/libclang-major-version-only.diff b/debian/patches/libclang-major-version-only.diff
new file mode 100644
index 00000000..36800f38
--- /dev/null
+++ b/debian/patches/libclang-major-version-only.diff
@@ -0,0 +1,11 @@
+--- a/clang/tools/libclang/CMakeLists.txt
++++ b/clang/tools/libclang/CMakeLists.txt
+@@ -196,7 +196,7 @@
+                  OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libclang.map)
+ 
+     set_target_properties(libclang PROPERTIES
+-                          VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}
++                          VERSION ${LLVM_VERSION_MAJOR}
+                           ${LIBCLANG_SOVERSION_ARG})
+   endif()
+ endif()
diff --git a/debian/patches/series b/debian/patches/series
index 1bb20ec6..633aba14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -149,3 +149,4 @@ bolt-disable-emit-relocs.patch
 link-grpc.diff
 D158066-simd-ppc64el.patch
 ubuntu-releases.patch
+libclang-major-version-only.diff
diff --git a/debian/rules b/debian/rules
index 0641f0ec..f5413cb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,12 +13,14 @@ GXX_VERSIONED_PACKAGE    := $(shell dpkg-query -W -f '$${Depends}' g++ | grep -o
 GXX_VERSIONED_EXECUTABLE := $(shell dpkg -L $(GXX_VERSIONED_PACKAGE) | grep '/usr/bin/g++-[0-9][0-9.]*' | xargs ls -d | tail -n1 )
 GCC_VERSION              := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE))
 
+LLVM_EPOCH := 1:
 LLVM_VERSION   := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p")
 LLVM_VERSION_FULL := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1,p")
 LLVM_VERSION_SNAPSHOT := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:(.*),\1,p")
 ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL))
 	LLVM_VERSION_FULL := $(LLVM_VERSION).0.0
 endif
+LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$NF+=1; print}')
 
 SOURCE_NAME := $(shell dpkg-parsechangelog -S Source)
 ifneq (,$(findstring snapshot,$(SOURCE_NAME)))
@@ -604,7 +606,9 @@ stamps/preconfigure:
 		sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \
 			-e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \
 			-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
+			-e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \
 			-e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \
+			-e "s|@LLVM_VERSION_NEXT@|$(LLVM_VERSION_NEXT)|g" \
 			-e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \
 	done
 

From 0bb9f9b7776f4359177c2f7137af45e3addd88d3 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sat, 25 Nov 2023 09:54:10 +0100
Subject: [PATCH 234/349]   * libclang1-17: Provide a symlink for the last
 soname with the full version.

---
 debian/changelog              | 1 +
 debian/libclang1-X.Y.links.in | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da975607..b817622a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
     yet built on these architectures).
   * Fix stripping build flags on Ubuntu/ppc64el.
   * libclang1-17: Only encode the major version in the soname. Closes: #1056126.
+  * libclang1-17: Provide a symlink for the last soname with the full version.
 
   [ Sylvestre Ledru ]
   * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in
index f735225c..76b6c36c 100644
--- a/debian/libclang1-X.Y.links.in
+++ b/debian/libclang1-X.Y.links.in
@@ -2,3 +2,5 @@
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@
 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
+# one link for the last soname with the full version
+usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@

From 14a62b81b5ba7d0355a9ce08abe13e454676ccee Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sat, 25 Nov 2023 11:18:16 +0100
Subject: [PATCH 235/349] Don't install *clang_rt* on sparc and sparc64

---
 debian/changelog                      | 7 +++++++
 debian/libclang-rt-X.Y-dev.install.in | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b30b964e..dbe5c98b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-16 (1:16.0.6-20) UNRELEASED; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Don't install *clang_rt* on sparc and sparc64
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Sat, 25 Nov 2023 11:17:15 +0100
+
 llvm-toolchain-16 (1:16.0.6-19) unstable; urgency=medium
 
   * Revert my ugly fix for 1052002.
diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in
index 6864ec82..ebe7c0bd 100644
--- a/debian/libclang-rt-X.Y-dev.install.in
+++ b/debian/libclang-rt-X.Y-dev.install.in
@@ -2,7 +2,7 @@
 
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/sanitizer/
-usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt*
+[!sparc !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt*
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h

From 959d8c8ee100df40a8f3b19632a512c3b194ffd5 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sat, 25 Nov 2023 11:20:13 +0100
Subject: [PATCH 236/349] Don't install *clang_rt* on sparc and sparc64

---
 debian/changelog                      | 3 +++
 debian/libclang-rt-X.Y-dev.install.in | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b817622a..59840cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
   * add a check that, if we are going to build wasm, wasi-libc is installed
     on the system
 
+  [ John Paul Adrian Glaubitz ]
+  * Don't install *clang_rt* on sparc and sparc64
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 20 Nov 2023 19:34:35 +0100
 
 llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in
index 6864ec82..ebe7c0bd 100644
--- a/debian/libclang-rt-X.Y-dev.install.in
+++ b/debian/libclang-rt-X.Y-dev.install.in
@@ -2,7 +2,7 @@
 
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/sanitizer/
-usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt*
+[!sparc !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt*
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h

From 70cf59d852e16acfe40067d297b7cf0d7ba7fd3b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 27 Nov 2023 10:27:53 +0100
Subject: [PATCH 237/349] rebase of the patch

---
 debian/patches/0044-soname.diff | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff
index c678f7b0..ea0313c7 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_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt
+Index: llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/clang/tools/libclang/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/libclang/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt
+--- llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8.orig/clang/tools/libclang/CMakeLists.txt
++++ llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/clang/tools/libclang/CMakeLists.txt
 @@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
      remove_definitions("-D_XOPEN_SOURCE=700")
  endif()
@@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libc
    OUTPUT_NAME ${output_name}
    ${SOURCES}
  
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/llvm/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt
+--- llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8.orig/llvm/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/llvm/tools/llvm-shlib/CMakeLists.txt
 @@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
    endif()
    add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
@@ -27,5 +27,5 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-
 +  set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
 +
    list(REMOVE_DUPLICATES LIB_NAMES)
-   if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
-      OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
+   if((MINGW) OR (HAIKU)
+      OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")

From c07405b825c6e4f87b459c206b59ee7d43c3a5bc Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Mon, 27 Nov 2023 10:36:47 +0100
Subject: [PATCH 238/349]   * Restore the patch for D148945, searching
 /usr/lib/llvm-17/lib by default.     Closes: #1056580.

---
 debian/changelog                   |  2 ++
 debian/patches/D148945-revert.diff | 21 +++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 24 insertions(+)
 create mode 100644 debian/patches/D148945-revert.diff

diff --git a/debian/changelog b/debian/changelog
index 59840cff..6eda3383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
   * Fix stripping build flags on Ubuntu/ppc64el.
   * libclang1-17: Only encode the major version in the soname. Closes: #1056126.
   * libclang1-17: Provide a symlink for the last soname with the full version.
+  * Restore the patch for D148945, searching /usr/lib/llvm-17/lib by default.
+    Closes: #1056580.
 
   [ Sylvestre Ledru ]
   * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
diff --git a/debian/patches/D148945-revert.diff b/debian/patches/D148945-revert.diff
new file mode 100644
index 00000000..73426bdb
--- /dev/null
+++ b/debian/patches/D148945-revert.diff
@@ -0,0 +1,21 @@
+Restore that for now, we're not GenToo ...
+
+https://reviews.llvm.org/D148945
+https://reviews.llvm.org/D122444
+
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -333,6 +333,13 @@ Linux::Linux(const Driver &D, const llvm
+ 
+   Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths);
+ 
++  // The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs
++  // libc++.so in D.Dir+"/../lib/". Detect this path.
++  // TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported.
++  if (StringRef(D.Dir).startswith(SysRoot) &&
++      D.getVFS().exists(D.Dir + "/../lib/libc++.so"))
++    addPathIfExists(D, D.Dir + "/../lib", Paths);
++
+   addPathIfExists(D, concat(SysRoot, "/lib"), Paths);
+   addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 633aba14..20770031 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -150,3 +150,4 @@ link-grpc.diff
 D158066-simd-ppc64el.patch
 ubuntu-releases.patch
 libclang-major-version-only.diff
+D148945-revert.diff

From a505f7c3093c821bc92f3369f3c1f4af64b972a5 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 28 Nov 2023 11:42:43 +0100
Subject: [PATCH 239/349] fix unpack

---
 debian/unpack.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/unpack.sh b/debian/unpack.sh
index 50beaf17..77447f06 100644
--- a/debian/unpack.sh
+++ b/debian/unpack.sh
@@ -1,6 +1,6 @@
 set -e
-ORIG_VERSION=snapshot
-MAJOR_VERSION=17 # 8.0.1
+ORIG_VERSION=17
+MAJOR_VERSION=17.0.0 # 8.0.1
 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;'  | sort -ru`
 
 VERSION=$REV

From 408a72442de9473f683bc5ea4e9290a0170e0288 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 28 Nov 2023 12:17:09 +0100
Subject: [PATCH 240/349] fix changelog

---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6eda3383..c32620a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-1) unstable; urgency=medium
 
   [ Matthias Klose ]
   * Further limit the number of parallel processes
@@ -11,6 +11,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
     Closes: #1056580.
 
   [ Sylvestre Ledru ]
+  * New upstream release
   * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
     to fix https://github.com/llvm/llvm-project/issues/72753
   * try to relax the wasi-libc dep declaration for apt.llvm.org
@@ -20,7 +21,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
   [ John Paul Adrian Glaubitz ]
   * Don't install *clang_rt* on sparc and sparc64
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 20 Nov 2023 19:34:35 +0100
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 28 Nov 2023 11:43:43 +0100
 
 llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 

From 70032f71d7d5ad106f51d1fa844366e93cc97040 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Thu, 30 Nov 2023 22:04:50 +0100
Subject: [PATCH 241/349] Add new cmake-clang-test to spot issues such as
 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057151

---
 debian/tests/cmake-clang-test                | 29 ++++++++++++++++++++
 debian/tests/{cmake-test => cmake-llvm-test} |  4 +--
 debian/tests/control                         |  5 +++-
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100755 debian/tests/cmake-clang-test
 rename debian/tests/{cmake-test => cmake-llvm-test} (91%)

diff --git a/debian/tests/cmake-clang-test b/debian/tests/cmake-clang-test
new file mode 100755
index 00000000..89aa8e55
--- /dev/null
+++ b/debian/tests/cmake-clang-test
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+LLVM_VERSION=17
+
+# this is taken from libjsoncpp package
+# Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we
+# can avoid duplicating the effort (signal handling, etc.) here.
+if [ -z "$AUTOPKGTEST_TMP" ]
+then
+	echo "Required envvar AUTOPKGTEST_TMP \"$AUTOPKGTEST_TMP\" is not set" >&2
+	exit 1
+fi
+
+
+# the idea was taken from spirv-llvm-translator package
+
+cd "$AUTOPKGTEST_TMP"
+cat <<EOF > CMakeLists.txt
+cmake_minimum_required(VERSION 3.22)
+project(cmake-clang-test)
+find_package(Clang)
+
+EOF
+
+
+mkdir build && cd build
+cmake ..
diff --git a/debian/tests/cmake-test b/debian/tests/cmake-llvm-test
similarity index 91%
rename from debian/tests/cmake-test
rename to debian/tests/cmake-llvm-test
index f97d01e7..abaee6a2 100755
--- a/debian/tests/cmake-test
+++ b/debian/tests/cmake-llvm-test
@@ -18,8 +18,8 @@ fi
 
 cd "$AUTOPKGTEST_TMP"
 cat <<EOF > CMakeLists.txt
-cmake_minimum_required(VERSION 3.7)
-project(cmake-test)
+cmake_minimum_required(VERSION 3.22)
+project(cmake-llvm-test)
 find_package(LLVM $LLVM_VERSION REQUIRED
   COMPONENTS
     Analysis
diff --git a/debian/tests/control b/debian/tests/control
index fd712f0f..fac936c4 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -11,9 +11,12 @@ Depends: @, cmake, make, g++, libstdc++-13-dev
 Restrictions: allow-stderr
 Architecture: amd64 arm64
 
-Tests: cmake-test
+Tests: cmake-llvm-test
 Depends: gcc, build-essential, cmake, llvm-17-dev
 
+Tests: cmake-clang-test
+Depends: gcc, build-essential, cmake, clang-17
+
 Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)"
 Depends: python3-lldb-17
 

From 81ad4606812b05d8f867b356d28f5926137dcd68 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Thu, 30 Nov 2023 22:09:44 +0100
Subject: [PATCH 242/349] Add missing dependency for new test

---
 debian/tests/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/control b/debian/tests/control
index fac936c4..1e3e72a6 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -15,7 +15,7 @@ Tests: cmake-llvm-test
 Depends: gcc, build-essential, cmake, llvm-17-dev
 
 Tests: cmake-clang-test
-Depends: gcc, build-essential, cmake, clang-17
+Depends: gcc, build-essential, cmake, llvm-17-dev, clang-17, libclang-17-dev
 
 Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)"
 Depends: python3-lldb-17

From a483a6798ae742592827bba425b814080a53c698 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 1 Dec 2023 10:49:34 +0100
Subject: [PATCH 243/349] Try to fix Debian bug #1057151

---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index f5413cb5..aadfed07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1235,8 +1235,8 @@ endif
 # Disable CMake's package validation checks for binaries that may not be installed
 	sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
 
-# Adjust to the existing symlink. See #994827
-	sed -i "s|libclang-$(LLVM_VERSION).so.$(LLVM_VERSION).*\"|libclang-$(LLVM_VERSION).so.1\"|" $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
+# Adjust to the existing symlink. See #994827 #1057151
+	sed -i "s|libclang-$(LLVM_VERSION).so.$(LLVM_VERSION).*\"|libclang-$(LLVM_VERSION).so.$(LLVM_VERSION)\"|" $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
 
 # Managed in python*-lldb-X.Y.links.in
 	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/_lldb.so

From 83ad62f9cf5a8a637055dea281b9e43e5767713a Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 1 Dec 2023 10:50:39 +0100
Subject: [PATCH 244/349] Update changelog

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c32620a4..81c99296 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
+
+  * Add new cmake-clang-test to spot issues such as
+    Debina bug #1057151
+  * Fix cmake file (Closes: #1057151)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
+
 llvm-toolchain-17 (1:17.0.6-1) unstable; urgency=medium
 
   [ Matthias Klose ]

From e6bb61d2176fd5b03e15df05008b49faa7bff33b Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 1 Dec 2023 19:11:33 +0100
Subject: [PATCH 245/349]   * Also use the free swap to determine the number of
 parallel processes.

---
 debian/changelog | 4 ++++
 debian/rules     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 81c99296..0bd65adc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
 
+  [ Gianfranco Costamagna ]
   * Add new cmake-clang-test to spot issues such as
     Debina bug #1057151
   * Fix cmake file (Closes: #1057151)
 
+  [ Matthias Klose ]
+  * Also use the free swap to determine the number of parallel processes.
+
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
 
 llvm-toolchain-17 (1:17.0.6-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index aadfed07..680c2fa0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ ifneq (,$(filter flang-$(LLVM_VERSION), $(packages)))
 else
   MEM_PER_CPU=2100
 endif
-NJOBS := $(shell mt=`awk '/^MemTotal/ { print $$2 }' /proc/meminfo`; \
+NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' /proc/meminfo`; \
 		awk -vn=$(NCPUS) -vmt=$$mt -vm=$(MEM_PER_CPU) \
 		  'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2<n+1 ? n2 : n+1}' < /dev/null)
 

From bb32f75327c541a3e6ec0690fb5f3f467efdce71 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 1 Dec 2023 23:37:39 +0100
Subject: [PATCH 246/349] Fix typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0bd65adc..10594ef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Add new cmake-clang-test to spot issues such as
-    Debina bug #1057151
+    Debian bug #1057151
   * Fix cmake file (Closes: #1057151)
 
   [ Matthias Klose ]

From 97633b6d51ebc8579c5dbecd12a02fb933620620 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sat, 2 Dec 2023 23:20:35 +0100
Subject: [PATCH 247/349]   * Set the cpu defaults for the ARM32 architectures:
     - armel: arm9e. Closes: #1056115.     - armhf: cortex-a7.

---
 debian/changelog                   |  3 +++
 debian/patches/arm32-defaults.diff | 18 ++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 22 insertions(+)
 create mode 100644 debian/patches/arm32-defaults.diff

diff --git a/debian/changelog b/debian/changelog
index 10594ef6..9edbef3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
 
   [ Matthias Klose ]
   * Also use the free swap to determine the number of parallel processes.
+  * Set the cpu defaults for the ARM32 architectures:
+    - armel: arm9e. Closes: #1056115.
+    - armhf: cortex-a7.
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
 
diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff
new file mode 100644
index 00000000..fc077b65
--- /dev/null
+++ b/debian/patches/arm32-defaults.diff
@@ -0,0 +1,18 @@
+--- a/llvm/lib/TargetParser/ARMTargetParser.cpp
++++ b/llvm/lib/TargetParser/ARMTargetParser.cpp
+@@ -558,6 +558,15 @@
+     if (MArch == "v7k")
+       return "cortex-a7";
+     break;
++  case llvm::Triple::Linux:
++    switch (Triple.getEnvironment()) {
++    case llvm::Triple::GNUEABI:
++      return "arm9e"; // armv5te
++    case llvm::Triple::GNUEABIHF:
++      return "cortex-a7"; // armv7-a
++    default:
++      return "armv5";
++    }
+   default:
+     break;
+   }
diff --git a/debian/patches/series b/debian/patches/series
index 20770031..f77e9e6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -151,3 +151,4 @@ D158066-simd-ppc64el.patch
 ubuntu-releases.patch
 libclang-major-version-only.diff
 D148945-revert.diff
+arm32-defaults.diff

From 695fe3013f0a13151e83ca1dc8dcb2306464935b Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Mon, 4 Dec 2023 13:23:09 +0100
Subject: [PATCH 248/349]   * libclang1-17: Hard-code the last full versions
 for the symlinks.

---
 debian/changelog              | 1 +
 debian/libclang1-X.Y.links.in | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9edbef3d..54ffe469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
   * Set the cpu defaults for the ARM32 architectures:
     - armel: arm9e. Closes: #1056115.
     - armhf: cortex-a7.
+  * libclang1-17: Hard-code the last full versions for the symlinks.
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
 
diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in
index 76b6c36c..b1ab4423 100644
--- a/debian/libclang1-X.Y.links.in
+++ b/debian/libclang1-X.Y.links.in
@@ -3,4 +3,5 @@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@
 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
 # one link for the last soname with the full version
-usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@
+usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.17.0.5
+usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.17.0.4

From 04b600fe3bac81a92dbc5f180a6127ace270cd1d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 5 Dec 2023 07:41:52 +0100
Subject: [PATCH 249/349] Revert "  * Set the cpu defaults for the ARM32
 architectures:" for causing this issue:
 https://lore.kernel.org/lkml/20231204225148.GA2094126@dev-arch.thelio-3990X/T/

This reverts commit 97633b6d51ebc8579c5dbecd12a02fb933620620.
---
 debian/changelog                   | 10 ++++++++++
 debian/patches/arm32-defaults.diff | 18 ------------------
 debian/patches/series              |  1 -
 3 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 debian/patches/arm32-defaults.diff

diff --git a/debian/changelog b/debian/changelog
index 54ffe469..e4cd45c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
 
+<<<<<<<
   [ Gianfranco Costamagna ]
   * Add new cmake-clang-test to spot issues such as
     Debian bug #1057151
@@ -11,6 +12,15 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
     - armel: arm9e. Closes: #1056115.
     - armhf: cortex-a7.
   * libclang1-17: Hard-code the last full versions for the symlinks.
+=======
+  [ Gianfranco Costamagna ]
+  * Add new cmake-clang-test to spot issues such as
+    Debian bug #1057151
+  * Fix cmake file (Closes: #1057151)
+
+  [ Matthias Klose ]
+  * Also use the free swap to determine the number of parallel processes.
+>>>>>>>
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
 
diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff
deleted file mode 100644
index fc077b65..00000000
--- a/debian/patches/arm32-defaults.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/llvm/lib/TargetParser/ARMTargetParser.cpp
-+++ b/llvm/lib/TargetParser/ARMTargetParser.cpp
-@@ -558,6 +558,15 @@
-     if (MArch == "v7k")
-       return "cortex-a7";
-     break;
-+  case llvm::Triple::Linux:
-+    switch (Triple.getEnvironment()) {
-+    case llvm::Triple::GNUEABI:
-+      return "arm9e"; // armv5te
-+    case llvm::Triple::GNUEABIHF:
-+      return "cortex-a7"; // armv7-a
-+    default:
-+      return "armv5";
-+    }
-   default:
-     break;
-   }
diff --git a/debian/patches/series b/debian/patches/series
index f77e9e6f..20770031 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -151,4 +151,3 @@ D158066-simd-ppc64el.patch
 ubuntu-releases.patch
 libclang-major-version-only.diff
 D148945-revert.diff
-arm32-defaults.diff

From e03dd055542c67176307db28fcab544b291af110 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 5 Dec 2023 07:45:54 +0100
Subject: [PATCH 250/349] fix changelog

---
 debian/changelog | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4cd45c5..f4dcf507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
 
-<<<<<<<
   [ Gianfranco Costamagna ]
   * Add new cmake-clang-test to spot issues such as
     Debian bug #1057151
@@ -8,19 +7,8 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
 
   [ Matthias Klose ]
   * Also use the free swap to determine the number of parallel processes.
-  * Set the cpu defaults for the ARM32 architectures:
-    - armel: arm9e. Closes: #1056115.
-    - armhf: cortex-a7.
   * libclang1-17: Hard-code the last full versions for the symlinks.
-=======
-  [ Gianfranco Costamagna ]
-  * Add new cmake-clang-test to spot issues such as
-    Debian bug #1057151
-  * Fix cmake file (Closes: #1057151)
-
-  [ Matthias Klose ]
   * Also use the free swap to determine the number of parallel processes.
->>>>>>>
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
 

From 01a06b481e5a2610c7387149b58978c3ec281f2c Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 5 Dec 2023 09:42:31 +0100
Subject: [PATCH 251/349]   * Set the cpu defaults for the ARM32 architectures:
     - armel: arm926ej-s. Closes: #1056115.     - armhf: cortex-a8.     Thanks
 to Arnd Bergmann and Ard Biesheuvel for the fixes.

---
 debian/changelog                   |  4 ++++
 debian/patches/arm32-defaults.diff | 14 ++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 19 insertions(+)
 create mode 100644 debian/patches/arm32-defaults.diff

diff --git a/debian/changelog b/debian/changelog
index f4dcf507..27ac99ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
   * Also use the free swap to determine the number of parallel processes.
   * libclang1-17: Hard-code the last full versions for the symlinks.
   * Also use the free swap to determine the number of parallel processes.
+  * Set the cpu defaults for the ARM32 architectures:
+    - armel: arm926ej-s. Closes: #1056115.
+    - armhf: cortex-a8.
+    Thanks to Arnd Bergmann and Ard Biesheuvel for the fixes.
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
 
diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff
new file mode 100644
index 00000000..4a392854
--- /dev/null
+++ b/debian/patches/arm32-defaults.diff
@@ -0,0 +1,14 @@
+--- a/llvm/lib/TargetParser/ARMTargetParser.cpp
++++ b/llvm/lib/TargetParser/ARMTargetParser.cpp
+@@ -590,9 +590,9 @@ StringRef ARM::getARMCPUForArch(const ll
+     case llvm::Triple::EABIHF:
+     case llvm::Triple::GNUEABIHF:
+     case llvm::Triple::MuslEABIHF:
+-      return "cortex-a7";
++      return "cortex-a8";
+     default:
+-      return "arm7tdmi";
++      return "arm926ej-s";
+     }
+   }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 20770031..f77e9e6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -151,3 +151,4 @@ D158066-simd-ppc64el.patch
 ubuntu-releases.patch
 libclang-major-version-only.diff
 D148945-revert.diff
+arm32-defaults.diff

From 5e253166accd594a1756b882b6e8bc20e783d554 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 6 Dec 2023 09:59:55 +0100
Subject: [PATCH 252/349]   * Apply the proposed fix for D158491, build failure
 on mips64el, still     unreviewed upstream. Addresses: #1056116.

---
 debian/changelog            |  2 ++
 debian/patches/D158491.diff | 53 +++++++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 56 insertions(+)
 create mode 100644 debian/patches/D158491.diff

diff --git a/debian/changelog b/debian/changelog
index 27ac99ca..51fc43d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
     - armel: arm926ej-s. Closes: #1056115.
     - armhf: cortex-a8.
     Thanks to Arnd Bergmann and Ard Biesheuvel for the fixes.
+  * Apply the proposed fix for D158491, build failure on mips64el, still
+    unreviewed upstream. Addresses: #1056116.
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
 
diff --git a/debian/patches/D158491.diff b/debian/patches/D158491.diff
new file mode 100644
index 00000000..1ce768e1
--- /dev/null
+++ b/debian/patches/D158491.diff
@@ -0,0 +1,53 @@
+see https://reviews.llvm.org/D158491, still unreviewed upstream
+
+--- a/compiler-rt/lib/interception/interception.h
++++ b/compiler-rt/lib/interception/interception.h
+@@ -199,8 +199,9 @@
+        ".type  " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", %function\n"         \
+        SANITIZER_STRINGIFY(TRAMPOLINE(func)) ":\n"                             \
+        SANITIZER_STRINGIFY(CFI_STARTPROC) "\n"                                 \
+-       SANITIZER_STRINGIFY(ASM_TAIL_CALL) " __interceptor_"                    \
+-         SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func)) "\n"                   \
++       C_ASM_TAIL_CALL(SANITIZER_STRINGIFY(TRAMPOLINE(func)),                  \
++                       "__interceptor_"                                        \
++                         SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func))) "\n"  \
+        SANITIZER_STRINGIFY(CFI_ENDPROC) "\n"                                   \
+        ".size  " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", "                    \
+             ".-" SANITIZER_STRINGIFY(TRAMPOLINE(func)) "\n"                    \
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
+@@ -44,6 +44,8 @@
+ 
+ #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__)
+ # define ASM_TAIL_CALL jmp
++#elif defined(__mips__) && __mips_isa_rev >= 6
++# define ASM_TAIL_CALL bc
+ #elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \
+     defined(__powerpc__) || defined(__loongarch_lp64)
+ # define ASM_TAIL_CALL b
+@@ -53,6 +55,25 @@
+ # define ASM_TAIL_CALL tail
+ #endif
+ 
++#if defined(__mips64) && __mips_isa_rev < 6
++# define C_ASM_TAIL_CALL(tfunc, ifunc)                        \
++    "lui $t8, %hi(%neg(%gp_rel(" tfunc ")))\n"                \
++    "daddu $t8, $t8, $t9\n"                                   \
++    "daddu $t8, $t8, %lo(%neg(%gp_rel(" tfunc ")))\n"         \
++    "ld $t9, %got_disp(" ifunc ")($t8)\n"                     \
++    "jr $t9\n"
++#elif defined(__mips__) && __mips_isa_rev < 6
++# define C_ASM_TAIL_CALL(tfunc, ifunc)                        \
++    ".set    noreorder\n"                                     \
++    ".cpload $t9\n"                                           \
++    ".set    reorder\n"                                       \
++    "lw $t9, %got(" ifunc ")($gp)\n"                          \
++    "jr $t9\n"
++#elif defined(ASM_TAIL_CALL)
++#  define C_ASM_TAIL_CALL(tfunc, ifunc) \
++    SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " ifunc
++#endif
++
+ #if defined(__ELF__) && defined(__x86_64__) || defined(__i386__) || \
+     defined(__riscv)
+ # define ASM_PREEMPTIBLE_SYM(sym) sym@plt
diff --git a/debian/patches/series b/debian/patches/series
index f77e9e6f..287502d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -152,3 +152,4 @@ ubuntu-releases.patch
 libclang-major-version-only.diff
 D148945-revert.diff
 arm32-defaults.diff
+D158491.diff

From b3f5e896b1c6a716ef3c533ffd0eba43d9722653 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Dec 2023 10:23:03 +0100
Subject: [PATCH 253/349] qualify-clang.sh : add missing package

---
 debian/qualify-clang.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index 962be053..afe20b12 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -9,7 +9,7 @@ VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p")
 DETAILED_VERSION=$(dpkg-parsechangelog |  sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1\2\3,p")
 DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
 
-LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb  libclang-common-${VERSION}-dev_${DETAILED_VERSION}_all.deb  llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb  liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb"
+LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-clang-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb  libclang-common-${VERSION}-dev_${DETAILED_VERSION}_all.deb  llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb  liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb"
 
 echo "To install everything:"
 echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*' 'libunwind-*' 'libclc-*' 'libclc-*dev' 'libmlir-*'"

From f82e3a2f959809fd06dcb7ed251a4fcf1f219b0c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Dec 2023 10:25:31 +0100
Subject: [PATCH 254/349] libc++experimental.a is in libc++-17-dev, not
 libc++abi-17-dev

---
 debian/libc++-X.Y-dev.links.in    | 1 +
 debian/libc++abi-X.Y-dev.links.in | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/libc++-X.Y-dev.links.in b/debian/libc++-X.Y-dev.links.in
index 854e14b7..3e55af80 100644
--- a/debian/libc++-X.Y-dev.links.in
+++ b/debian/libc++-X.Y-dev.links.in
@@ -1,3 +1,4 @@
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a /usr/lib/@DEB_HOST_MULTIARCH@/libc++.a
 usr/lib/llvm-@LLVM_VERSION@/include/c++/v1 /usr/include/c++/v1
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a /usr/lib/@DEB_HOST_MULTIARCH@/libc++experimental.a
diff --git a/debian/libc++abi-X.Y-dev.links.in b/debian/libc++abi-X.Y-dev.links.in
index e1814c9b..6dd5f555 100644
--- a/debian/libc++abi-X.Y-dev.links.in
+++ b/debian/libc++abi-X.Y-dev.links.in
@@ -1,2 +1 @@
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a /usr/lib/@DEB_HOST_MULTIARCH@/libc++experimental.a

From dd52f2e40c189db713624cb59c9bc0f4868f5cd6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Dec 2023 10:33:00 +0100
Subject: [PATCH 255/349] rename of the patch

---
 debian/patches/{D158491.diff => mips/D154390-pre-R6.diff} | 0
 debian/patches/series                                     | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename debian/patches/{D158491.diff => mips/D154390-pre-R6.diff} (100%)

diff --git a/debian/patches/D158491.diff b/debian/patches/mips/D154390-pre-R6.diff
similarity index 100%
rename from debian/patches/D158491.diff
rename to debian/patches/mips/D154390-pre-R6.diff
diff --git a/debian/patches/series b/debian/patches/series
index 287502d7..b3b2ddc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -152,4 +152,4 @@ ubuntu-releases.patch
 libclang-major-version-only.diff
 D148945-revert.diff
 arm32-defaults.diff
-D158491.diff
+mips/D154390-pre-R6.diff

From 2d79706115c87705caa59e9d88f6a65fc932ae76 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Dec 2023 11:20:00 +0100
Subject: [PATCH 256/349] Move the symlink /usr/lib/*/libc++experimental.a from
 libc++abi-17-dev to libc++-17-dev

---
 debian/changelog  | 6 +++++-
 debian/control.in | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51fc43d0..3632435f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,11 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
   * Apply the proposed fix for D158491, build failure on mips64el, still
     unreviewed upstream. Addresses: #1056116.
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Dec 2023 10:50:00 +0100
+  [ Sylvestre Ledru ]
+  * Move the symlink /usr/lib/*/libc++experimental.a from libc++abi-17-dev
+    to libc++-17-dev
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 06 Dec 2023 11:19:17 +0100
 
 llvm-toolchain-17 (1:17.0.6-1) unstable; urgency=medium
 
diff --git a/debian/control.in b/debian/control.in
index e8ae25cb..d12b8c58 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -689,10 +689,10 @@ Architecture: any
 Multi-Arch: same
 Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends},
  libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
-Breaks: libc++-dev (<< 44)
+Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:17.0.6-2)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
-Replaces: libc++-x.y-dev
+Replaces: libc++-x.y-dev, libc++abi-@LLVM_VERSION@-dev (<< 1:17.0.6-2)
 Description: LLVM C++ Standard library (development files)
  libc++ is another implementation of the C++ standard library
  .

From 5643163c613bc2608b8e623674a818fd376c0a63 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Dec 2023 11:22:19 +0100
Subject: [PATCH 257/349] refresh debian/control

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index b2b699c9..77c96ddf 100644
--- a/debian/control
+++ b/debian/control
@@ -689,10 +689,10 @@ Architecture: any
 Multi-Arch: same
 Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends},
  libunwind-17-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
-Breaks: libc++-dev (<< 44)
+Breaks: libc++-dev (<< 44), libc++abi-17-dev (<< 1:17.0.6-2)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
-Replaces: libc++-x.y-dev
+Replaces: libc++-x.y-dev, libc++abi-17-dev (<< 1:17.0.6-2)
 Description: LLVM C++ Standard library (development files)
  libc++ is another implementation of the C++ standard library
  .

From ee43996aaebe81a7745a931562a03ccd3599eaf8 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Dec 2023 11:22:52 +0100
Subject: [PATCH 258/349] remove old break/replaces

---
 debian/changelog  |  1 +
 debian/control    | 10 ----------
 debian/control.in | 10 ----------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3632435f..e4eb7aeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
   [ Sylvestre Ledru ]
   * Move the symlink /usr/lib/*/libc++experimental.a from libc++abi-17-dev
     to libc++-17-dev
+  * Remove some old break/replaces from 16
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 06 Dec 2023 11:19:17 +0100
 
diff --git a/debian/control b/debian/control
index 77c96ddf..b58c452d 100644
--- a/debian/control
+++ b/debian/control
@@ -187,8 +187,6 @@ Package: libclang-rt-17-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Compiler-rt - development package
  This package provides various libraries:
@@ -205,10 +203,7 @@ Package: libclang-rt-17-dev-wasm32
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libclang-common-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Compiler-rt - wasm32 builtins
  Provides the compiler-rt builtins for WebAssembly 32 bits
 
@@ -216,10 +211,7 @@ Package: libclang-rt-17-dev-wasm64
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libclang-common-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Compiler-rt - wasm64 builtins
  Provides the compiler-rt builtins for WebAssembly 64 bits
 
@@ -229,8 +221,6 @@ Package: libpolly-17-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: High-level loop and data-locality optimizer
  Uses an abstract mathematical representation based on integer polyhedra
diff --git a/debian/control.in b/debian/control.in
index d12b8c58..f83a0c73 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -187,8 +187,6 @@ Package: libclang-rt-@LLVM_VERSION@-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Compiler-rt - development package
  This package provides various libraries:
@@ -205,10 +203,7 @@ Package: libclang-rt-@LLVM_VERSION@-dev-wasm32
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libclang-common-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Compiler-rt - wasm32 builtins
  Provides the compiler-rt builtins for WebAssembly 32 bits
 
@@ -216,10 +211,7 @@ Package: libclang-rt-@LLVM_VERSION@-dev-wasm64
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libclang-common-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Compiler-rt - wasm64 builtins
  Provides the compiler-rt builtins for WebAssembly 64 bits
 
@@ -229,8 +221,6 @@ Package: libpolly-@LLVM_VERSION@-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
-Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: High-level loop and data-locality optimizer
  Uses an abstract mathematical representation based on integer polyhedra

From 55b75cf44f1eae97cd0e92f7264ea51b67d2af32 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Dec 2023 15:10:01 +0100
Subject: [PATCH 259/349] Fix the EmitBackendOutput test in
 debian/qualify-clang.sh

---
 debian/changelog        | 3 ++-
 debian/qualify-clang.sh | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4eb7aeb..d9bc14e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,9 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
   * Move the symlink /usr/lib/*/libc++experimental.a from libc++abi-17-dev
     to libc++-17-dev
   * Remove some old break/replaces from 16
+  * Fix the EmitBackendOutput test in debian/qualify-clang.sh
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 06 Dec 2023 11:19:17 +0100
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 06 Dec 2023 15:09:55 +0100
 
 llvm-toolchain-17 (1:17.0.6-1) unstable; urgency=medium
 
diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index afe20b12..d85aaed4 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -1376,6 +1376,7 @@ clang++-$VERSION -O2 -fprofile-instr-use=foo.profdata foo.cc -o foo
 # https://bugs.llvm.org/show_bug.cgi?id=44870
 cat <<EOF > foo.cpp
 #include <clang/CodeGen/BackendUtil.h>
+#include <llvm/Support/VirtualFileSystem.h>
 
 using namespace clang;
 
@@ -1389,8 +1390,9 @@ int main() {
   llvm::Module* m;
   BackendAction* action;
   std::unique_ptr<raw_pwrite_stream> AsmOutStream;
+  IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS;
 
-  EmitBackendOutput(*diags, *hsOpts, *cgOpts, *tOpts, *lOpts, *tDesc, m, *action, std::move(AsmOutStream));
+  EmitBackendOutput(*diags, *hsOpts, *cgOpts, *tOpts, *lOpts, *tDesc, m, *action, VFS, std::move(AsmOutStream));
 }
 EOF
 clang++-$VERSION foo.cpp -o test -lclangBasic -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangCodeGen -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangFrontend -lclangDriver -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -lclangBasic -ldl  /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -ldl  -I /usr/lib/llvm-$VERSION/include/ -L/usr/lib/llvm-$VERSION/lib/ -lPolly -lPollyISL

From 9622f7635adf9825d11845181ecb560841c1be12 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Dec 2023 17:56:50 +0100
Subject: [PATCH 260/349] Also add back /usr/lib/llvm-17/lib/libclang-17.so.1

---
 debian/changelog              | 1 +
 debian/libclang1-X.Y.links.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d9bc14e9..bb8b38fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
     to libc++-17-dev
   * Remove some old break/replaces from 16
   * Fix the EmitBackendOutput test in debian/qualify-clang.sh
+  * Also add back /usr/lib/llvm-17/lib/libclang-17.so.1
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 06 Dec 2023 15:09:55 +0100
 
diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in
index b1ab4423..91a1ca2d 100644
--- a/debian/libclang1-X.Y.links.in
+++ b/debian/libclang1-X.Y.links.in
@@ -1,6 +1,7 @@
 # as upstream
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@
+usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1
 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
 # one link for the last soname with the full version
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.17.0.5

From 92c2f7926007cbcdaf83d71f6667a5d155d766fb Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Dec 2023 09:47:59 +0100
Subject: [PATCH 261/349] Drop sed command, useless now

---
 debian/rules | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 11d00a96..d7ae36bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1234,9 +1234,6 @@ endif
 # Disable CMake's package validation checks for binaries that may not be installed
 	sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
 
-# Adjust to the existing symlink. See #994827 #1057151
-	sed -i "s|libclang-$(LLVM_VERSION).so.$(LLVM_VERSION).*\"|libclang-$(LLVM_VERSION).so.$(LLVM_VERSION)\"|" $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
-
 # Managed in python*-lldb-X.Y.links.in
 	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/_lldb.so
 

From 142b0f07b475230a1749b8bacaf6ba31b7c41a8a Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Dec 2023 09:49:20 +0100
Subject: [PATCH 262/349] Update changelog

---
 debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bb8b38fb..a1aa88fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
   * Add new cmake-clang-test to spot issues such as
     Debian bug #1057151
   * Fix cmake file (Closes: #1057151)
+  * Drop sed command, useless now
 
   [ Matthias Klose ]
   * Also use the free swap to determine the number of parallel processes.
@@ -23,7 +24,7 @@ llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
   * Fix the EmitBackendOutput test in debian/qualify-clang.sh
   * Also add back /usr/lib/llvm-17/lib/libclang-17.so.1
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 06 Dec 2023 15:09:55 +0100
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 08 Dec 2023 09:49:04 +0100
 
 llvm-toolchain-17 (1:17.0.6-1) unstable; urgency=medium
 

From e080ef40f3c7e5f77d83ed748004939656386bef Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 8 Dec 2023 09:55:23 +0100
Subject: [PATCH 263/349] fix https://github.com/llvm/llvm-project/issues/74766

---
 debian/rules | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/rules b/debian/rules
index d7ae36bb..6f953d47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -624,6 +624,13 @@ stamps/preconfigure:
 		debian/llvm-$(LLVM_VERSION)-linker-tools.links \
 		debian/libbolt-$(LLVM_VERSION)-dev.install
 
+	# workaround the breaks/replaces/conflicts introduced with the libc++ move
+	# we update the version to make it work with apt.llvm.org
+	# Yeah, this is ugly but I don't know how to do better
+	if test "$(LLVM_VERSION)" = "17"; then \
+		sed -i -e "s|(<< 1:17.0.6-2)|(<< 1:17.0.6~++20231206041259)|g" debian/control; \
+	fi
+
 	# llvm-spirv was found, so we can enable *.spv files. Debian
 	# buster and Ubuntu 18.04 don't have llvm-spirv to create the
 	# *.spv files.

From 395e9a3e89eaa10541c71fdf4604f98ae3e90647 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 6 Dec 2023 16:43:10 +0100
Subject: [PATCH 264/349] qualify-clang.sh: fix the filename

---
 debian/qualify-clang.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index d85aaed4..a8aa3312 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -9,7 +9,7 @@ VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p")
 DETAILED_VERSION=$(dpkg-parsechangelog |  sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1\2\3,p")
 DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
 
-LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-clang-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb  libclang-common-${VERSION}-dev_${DETAILED_VERSION}_all.deb  llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb  liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb"
+LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-clang-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb  libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb  liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb"
 
 echo "To install everything:"
 echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*' 'libunwind-*' 'libclc-*' 'libclc-*dev' 'libmlir-*'"

From 5a842ba5c2d44316e121f4699583e13ad8afba84 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 9 Dec 2023 23:15:39 +0100
Subject: [PATCH 265/349] prepare upload

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a1aa88fb..38179801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-2) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Add new cmake-clang-test to spot issues such as

From e20f4b1bbacbe7a5a3d9038caeb5e185f99bb565 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Mon, 11 Dec 2023 22:56:07 +0100
Subject: [PATCH 266/349]   * libclang1-17: Remove the full version symlinks.

---
 debian/changelog              | 6 ++++++
 debian/libclang1-X.Y.links.in | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38179801..fd9d2af8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.6-3) UNRELEASED; urgency=medium
+
+  * libclang1-17: Remove the full version symlinks.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 11 Dec 2023 22:54:48 +0100
+
 llvm-toolchain-17 (1:17.0.6-2) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in
index 91a1ca2d..5c1051d0 100644
--- a/debian/libclang1-X.Y.links.in
+++ b/debian/libclang1-X.Y.links.in
@@ -3,6 +3,3 @@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@
 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1
 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
-# one link for the last soname with the full version
-usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.17.0.5
-usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.17.0.4

From 4c6dc0ef68d36e337f58923e095995c6a8a1e370 Mon Sep 17 00:00:00 2001
From: Faidon Liambotis <paravoid@debian.org>
Date: Fri, 5 Jan 2024 17:48:32 +0200
Subject: [PATCH 267/349] Add libc++-*-dev -> libc++abi-*-dev dependency

libc++abi-*-dev is necessary when using libc++-*-dev:
  $ apt install clang-17 libc++-17-dev
  $ clang++-17 -stdlib=libc++ -o hello hello.cpp
  /usr/bin/ld: cannot find -lc++abi: No such file or directory
  clang++-17: error: linker command failed with exit code 1 (use -v to see invocation)

Note that the libc++1-* -> libc++abi-* dependency already exists.
---
 debian/control    | 1 +
 debian/control.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index b58c452d..b49af158 100644
--- a/debian/control
+++ b/debian/control
@@ -678,6 +678,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends},
+ libc++abi-17-dev (= ${binary:Version}),
  libunwind-17-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44), libc++abi-17-dev (<< 1:17.0.6-2)
 Provides: libc++-x.y-dev
diff --git a/debian/control.in b/debian/control.in
index f83a0c73..7ea86a76 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -678,6 +678,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends},
+ libc++abi-@LLVM_VERSION@-dev (= ${binary:Version}),
  libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:17.0.6-2)
 Provides: libc++-x.y-dev

From 400d89390891a1e95eb15837baca64bf000a352b Mon Sep 17 00:00:00 2001
From: Faidon Liambotis <paravoid@debian.org>
Date: Fri, 5 Jan 2024 17:30:57 +0200
Subject: [PATCH 268/349] Enable COMPILER_RT_DEFAULT_TARGET_ONLY for all archs

This commit does two things in one go:
1) Enable COMPILER_RT_DEFAULT_TARGET_ONLY for i386 and amd64:

Right now i386/amd64 are building compiler-rt for each other, in
addition to themselves.:
 - libclang-rt-17-dev:amd64 is also shipping the i386 builtins, and
   Depending on libc6-i386:amd64/lib32stdc++:amd64.
 - libclang-rt-17-dev:i386 is also shipping the x86_64 built-ins, and
   Depending on libc6-amd64:i386/lib64stdc++6:i386/lib64atomic1:i386.

Beyond the extra cruft in files and dependencies, this means that the
amd64/i386 packages are shipping conflicting files, and dpkg is refusing
to unpack one in the presence of the other (an RC bug in itself). This
is also identified by the multiarch hinter with the following message:
   libclang-rt-17-dev conflicts on 78 files starting with /usr/lib/llvm-17/lib/clang/17/lib/linux/ on amd64 <-> i386

Let users who want to build e.g. 32-bit binaries in amd64 use multi-arch
for this use case, by installing libclang-rt-17-dev:i386. The
alternative would be to support multi-lib, and ship additional packages
such as libclang-rt-17-dev-i386:amd64 (and vice-versa), but this feels
like an overkill. Multi-lib remains still a possibility with (Debian's)
clang's default, libgcc (lib32gcc/lib64gcc) as well.

2) Enable COMPILER_RT_DEFAULT_TARGET_ONLY unconditionally:

This was being passed in an opt-in basis, via STAGE_ALL_CMAKE_EXTRA for
the following architectures:
  * armel
  * armhf
  * powerpc
  * sparc
  * sparc64
  * s390x
  * mips64el
  * hurd-i386

So, with i386/amd64 also opting-in, this leaves only a few remaining
Debian architectures.

Furthermore, upon inspecting compiler-rt/cmake/base-config-ix.cmake, it
looks like the only architectures that are actually building for
additional (non-default) targets are i386, amd64, powerpc (note: not
ppc64el!), mips*, and arm. Turns out we've disabled that for all of them
now.

Therefore, pass COMPILER_RT_DEFAULT_TARGET_ONLY=ON to all architectures
unconditionally, and thus reduce an additional variation factor.
---
 debian/rules | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6f953d47..0fd35b24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -173,7 +173,6 @@ export CXX=g++-$(GCC_VERSION)
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabi
-  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
 # align arch profile with debian baseline
 # https://wiki.debian.org/ArmEabiPort
   CFLAGS_EXTRA += -march=armv5t
@@ -189,7 +188,6 @@ endif
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),armhf))
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabihf
-  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
 # align arch profile with debian baseline
 # https://wiki.debian.org/ArmHardFloatPort#Minimum_CPU_.26_FPU
   CFLAGS_EXTRA += -march=armv7-a -mfpu=vfpv3-d16
@@ -210,7 +208,6 @@ endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),powerpc))
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=powerpc-linux-gnu
-  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
 endif
 
 # debug symbols OOM in Ubuntu Ubuntu and slows down build process.
@@ -222,19 +219,16 @@ endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),sparc))
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=sparc-linux-gnu
-  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),sparc64))
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=sparc64-linux-gnu
-  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),s390x))
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=s390x-linux-gnu
-  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
   LIBCXX_EXCEPTIONS := OFF
 # disable compiler-rt builtins (not supported for s390x)
   STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
@@ -243,7 +237,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390x))
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
-  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
   STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
   COMPILER_RT_USE_BUILTINS_LIBRARY := OFF
   LIBCXX_USE_COMPILER_RT := OFF
@@ -258,7 +251,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),x32))
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),hurd-i386))
-  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
 endif
 
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.8-20121128-1~ ; echo $$?),0)
@@ -756,6 +748,7 @@ endif
 	-DCOMPILER_RT_INCLUDE_TESTS=OFF \
 	-DCOMPILER_RT_USE_LIBCXX=OFF \
 	-DCOMPILER_RT_USE_BUILTINS_LIBRARY=$(COMPILER_RT_USE_BUILTINS_LIBRARY) \
+	-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
 	-DLIBUNWIND_USE_COMPILER_RT=ON \
 	-DLIBUNWIND_INSTALL_LIBRARY=OFF \
 	-DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \
@@ -777,7 +770,7 @@ endif
 	-DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
 	-DCLANG_ENABLE_BOOTSTRAP=ON \
 	-DCLANG_BOOTSTRAP_TARGETS="$(ENABLED_STAGE2_CMAKE_BUILD_TARGETS)" \
-	-DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION;CMAKE_C_COMPILER_LAUNCHER;CMAKE_CXX_COMPILER_LAUNCHER" \
+	-DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_DEFAULT_TARGET_ONLY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION;CMAKE_C_COMPILER_LAUNCHER;CMAKE_CXX_COMPILER_LAUNCHER" \
 	-DBOOTSTRAP_CMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DBOOTSTRAP_CMAKE_C_FLAGS_RELWITHDEBINFO="$(opt_flags)" \
 	-DBOOTSTRAP_CMAKE_CXX_FLAGS_RELWITHDEBINFO="$(opt_flags)" \

From 1b0abffef7149d26f5c0cb6480bfc7016b1673ee Mon Sep 17 00:00:00 2001
From: Faidon Liambotis <paravoid@debian.org>
Date: Fri, 5 Jan 2024 17:41:12 +0200
Subject: [PATCH 269/349] Enable COMPILER_RT_BUILD_BUILTINS for armel

According to upstream commit aadec60ad9b81f00cf6fcdcbff61f1144d206769,
starting with LLVM 17, armv4t is now supported.

(untested)
---
 debian/rules | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6f953d47..027183e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,9 +178,6 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
 # https://wiki.debian.org/ArmEabiPort
   CFLAGS_EXTRA += -march=armv5t
   CXXFLAGS_EXTRA += -march=armv5t
-# disable compiler-rt builtins (not supported for baseline armel arch: armv5t)
-# See http://lists.llvm.org/pipermail/llvm-dev/2016-May/099761.html
-  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
   COMPILER_RT_USE_BUILTINS_LIBRARY := OFF
   LIBCXX_USE_COMPILER_RT := OFF
 # disable scudo standalone (not supported for baseline armel arch: armv5t)

From 7b0348cfde0ba338fff190925a573a30bd7214d3 Mon Sep 17 00:00:00 2001
From: Faidon Liambotis <paravoid@debian.org>
Date: Sat, 6 Jan 2024 08:59:02 +0200
Subject: [PATCH 270/349] Drop two unreferenced debian/patches

sparc/sparc-D98574-clang-def.patch and
sparc/sparc-D98575-compiler-rt.patch are not in debian/patches/series so
it's safe to drop them. D98574 is now merged, D98575 is abandoned, due
to it being fixed elsewhere, so there's no chance they're going to be
revived either.
---
 .../sparc/sparc-D98574-clang-def.patch        | 3762 -----------------
 .../sparc/sparc-D98575-compiler-rt.patch      |   17 -
 2 files changed, 3779 deletions(-)
 delete mode 100644 debian/patches/sparc/sparc-D98574-clang-def.patch
 delete mode 100644 debian/patches/sparc/sparc-D98575-compiler-rt.patch

diff --git a/debian/patches/sparc/sparc-D98574-clang-def.patch b/debian/patches/sparc/sparc-D98574-clang-def.patch
deleted file mode 100644
index 9f7fd837..00000000
--- a/debian/patches/sparc/sparc-D98574-clang-def.patch
+++ /dev/null
@@ -1,3762 +0,0 @@
---- llvm-toolchain-12-12.0.1~+rc1.orig/clang/lib/Basic/Targets/Sparc.cpp
-+++ llvm-toolchain-12-12.0.1~+rc1/clang/lib/Basic/Targets/Sparc.cpp
-@@ -156,8 +156,6 @@ void SparcV8TargetInfo::getTargetDefines
-       Builder.defineMacro("__sparcv8__");
-       break;
-     case CG_V9:
--      Builder.defineMacro("__sparcv9");
--      Builder.defineMacro("__sparcv9__");
-       Builder.defineMacro("__sparc_v9__");
-       break;
-     }
-@@ -239,13 +237,25 @@ void SparcV8TargetInfo::getTargetDefines
- void SparcV9TargetInfo::getTargetDefines(const LangOptions &Opts,
-                                          MacroBuilder &Builder) const {
-   SparcTargetInfo::getTargetDefines(Opts, Builder);
--  Builder.defineMacro("__sparcv9");
-   Builder.defineMacro("__arch64__");
--  // Solaris doesn't need these variants, but the BSDs do.
--  if (getTriple().getOS() != llvm::Triple::Solaris) {
-+  switch (getTriple().getOS()) {
-+  case llvm::Triple::Linux:
-+    Builder.defineMacro("__sparc_v9__");
-+    break;
-+  case llvm::Triple::FreeBSD:
-+  case llvm::Triple::NetBSD:
-     Builder.defineMacro("__sparc64__");
-     Builder.defineMacro("__sparc_v9__");
-+    Builder.defineMacro("__sparcv9");
-+    break;
-+  case llvm::Triple::OpenBSD:
-+    Builder.defineMacro("__sparc64__");
-     Builder.defineMacro("__sparcv9__");
-+    Builder.defineMacro("__sparc_v9__");
-+    break;
-+  case llvm::Triple::Solaris:
-+    Builder.defineMacro("__sparcv9");
-+    break;
-   }
- 
-   Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1");
---- llvm-toolchain-12-12.0.1~+rc1.orig/clang/test/Preprocessor/predefined-arch-macros.c
-+++ llvm-toolchain-12-12.0.1~+rc1/clang/test/Preprocessor/predefined-arch-macros.c
-@@ -3418,11 +3418,8 @@
- // CHECK_SPARC: #define __BIG_ENDIAN__ 1
- // CHECK_SPARC: #define __sparc 1
- // CHECK_SPARC: #define __sparc__ 1
--// CHECK_SPARC-NOT: #define __sparcv9 1
--// CHECK_SPARC-NOT: #define __sparcv9__ 1
- // CHECK_SPARC: #define __sparcv8 1
--// CHECK_SPARC-NOT: #define __sparcv9 1
--// CHECK_SPARC-NOT: #define __sparcv9__ 1
-+// CHECK_SPARC-NOT: #define __sparc_v9__ 1
- 
- // RUN: %clang -mcpu=v9 -E -dM %s -o - 2>&1 \
- // RUN:     -target sparc-unknown-linux \
-@@ -3430,8 +3427,6 @@
- // CHECK_SPARC-V9-NOT: #define __sparcv8 1
- // CHECK_SPARC-V9-NOT: #define __sparcv8__ 1
- // CHECK_SPARC-V9: #define __sparc_v9__ 1
--// CHECK_SPARC-V9: #define __sparcv9 1
--// CHECK_SPARC-V9: #define __sparcv9__ 1
- 
- // RUN: %clang -E -dM %s -o - 2>&1 \
- // RUN:     -target sparc-sun-solaris \
-@@ -3518,12 +3513,10 @@
- // RUN:     -target sparcv9-unknown-linux \
- // RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARCV9
- // CHECK_SPARCV9: #define __BIG_ENDIAN__ 1
-+// CHECK_SPARCV9: #define __arch64__ 1
- // CHECK_SPARCV9: #define __sparc 1
--// CHECK_SPARCV9: #define __sparc64__ 1
- // CHECK_SPARCV9: #define __sparc__ 1
- // CHECK_SPARCV9: #define __sparc_v9__ 1
--// CHECK_SPARCV9: #define __sparcv9 1
--// CHECK_SPARCV9: #define __sparcv9__ 1
- 
- // RUN: %clang -E -dM %s -o - 2>&1 \
- // RUN:     -target sparcv9-unknown-linux \
---- /dev/null
-+++ llvm-toolchain-12-12.0.1~+rc1/clang/test/Preprocessor/predefined-arch-macros.c.orig
-@@ -0,0 +1,3681 @@
-+// REQUIRES: amdgpu-registered-target
-+// Begin X86/GCC/Linux tests ----------------
-+
-+// RUN: %clang -march=i386 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_I386_M32
-+// CHECK_I386_M32: #define __LAHF_SAHF__ 1
-+// CHECK_I386_M32: #define __i386 1
-+// CHECK_I386_M32: #define __i386__ 1
-+// CHECK_I386_M32: #define __tune_i386__ 1
-+// CHECK_I386_M32: #define i386 1
-+// RUN: not %clang -march=i386 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_I386_M64
-+// CHECK_I386_M64: error: {{.*}}
-+
-+// RUN: %clang -march=i486 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_I486_M32
-+// CHECK_I486_M32: #define __i386 1
-+// CHECK_I486_M32: #define __i386__ 1
-+// CHECK_I486_M32: #define __i486 1
-+// CHECK_I486_M32: #define __i486__ 1
-+// CHECK_I486_M32: #define __tune_i486__ 1
-+// CHECK_I486_M32: #define i386 1
-+// RUN: not %clang -march=i486 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_I486_M64
-+// CHECK_I486_M64: error: {{.*}}
-+
-+// RUN: %clang -march=i586 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_I586_M32
-+// CHECK_I586_M32: #define __i386 1
-+// CHECK_I586_M32: #define __i386__ 1
-+// CHECK_I586_M32: #define __i586 1
-+// CHECK_I586_M32: #define __i586__ 1
-+// CHECK_I586_M32: #define __pentium 1
-+// CHECK_I586_M32: #define __pentium__ 1
-+// CHECK_I586_M32: #define __tune_i586__ 1
-+// CHECK_I586_M32: #define __tune_pentium__ 1
-+// CHECK_I586_M32: #define i386 1
-+// RUN: not %clang -march=i586 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_I586_M64
-+// CHECK_I586_M64: error: {{.*}}
-+
-+// RUN: %clang -march=pentium -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_M32
-+// CHECK_PENTIUM_M32: #define __i386 1
-+// CHECK_PENTIUM_M32: #define __i386__ 1
-+// CHECK_PENTIUM_M32: #define __i586 1
-+// CHECK_PENTIUM_M32: #define __i586__ 1
-+// CHECK_PENTIUM_M32: #define __pentium 1
-+// CHECK_PENTIUM_M32: #define __pentium__ 1
-+// CHECK_PENTIUM_M32: #define __tune_i586__ 1
-+// CHECK_PENTIUM_M32: #define __tune_pentium__ 1
-+// CHECK_PENTIUM_M32: #define i386 1
-+// RUN: not %clang -march=pentium -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_M64
-+// CHECK_PENTIUM_M64: error: {{.*}}
-+
-+// RUN: %clang -march=pentium-mmx -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_MMX_M32
-+// CHECK_PENTIUM_MMX_M32: #define __MMX__ 1
-+// CHECK_PENTIUM_MMX_M32: #define __i386 1
-+// CHECK_PENTIUM_MMX_M32: #define __i386__ 1
-+// CHECK_PENTIUM_MMX_M32: #define __i586 1
-+// CHECK_PENTIUM_MMX_M32: #define __i586__ 1
-+// CHECK_PENTIUM_MMX_M32: #define __pentium 1
-+// CHECK_PENTIUM_MMX_M32: #define __pentium__ 1
-+// CHECK_PENTIUM_MMX_M32: #define __pentium_mmx__ 1
-+// CHECK_PENTIUM_MMX_M32: #define __tune_i586__ 1
-+// CHECK_PENTIUM_MMX_M32: #define __tune_pentium__ 1
-+// CHECK_PENTIUM_MMX_M32: #define __tune_pentium_mmx__ 1
-+// CHECK_PENTIUM_MMX_M32: #define i386 1
-+// RUN: not %clang -march=pentium-mmx -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_MMX_M64
-+// CHECK_PENTIUM_MMX_M64: error: {{.*}}
-+
-+// RUN: %clang -march=winchip-c6 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_WINCHIP_C6_M32
-+// CHECK_WINCHIP_C6_M32: #define __MMX__ 1
-+// CHECK_WINCHIP_C6_M32: #define __i386 1
-+// CHECK_WINCHIP_C6_M32: #define __i386__ 1
-+// CHECK_WINCHIP_C6_M32: #define __i486 1
-+// CHECK_WINCHIP_C6_M32: #define __i486__ 1
-+// CHECK_WINCHIP_C6_M32: #define __tune_i486__ 1
-+// CHECK_WINCHIP_C6_M32: #define i386 1
-+// RUN: not %clang -march=winchip-c6 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_WINCHIP_C6_M64
-+// CHECK_WINCHIP_C6_M64: error: {{.*}}
-+
-+// RUN: %clang -march=winchip2 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_WINCHIP2_M32
-+// CHECK_WINCHIP2_M32: #define __3dNOW__ 1
-+// CHECK_WINCHIP2_M32: #define __MMX__ 1
-+// CHECK_WINCHIP2_M32: #define __i386 1
-+// CHECK_WINCHIP2_M32: #define __i386__ 1
-+// CHECK_WINCHIP2_M32: #define __i486 1
-+// CHECK_WINCHIP2_M32: #define __i486__ 1
-+// CHECK_WINCHIP2_M32: #define __tune_i486__ 1
-+// CHECK_WINCHIP2_M32: #define i386 1
-+// RUN: not %clang -march=winchip2 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_WINCHIP2_M64
-+// CHECK_WINCHIP2_M64: error: {{.*}}
-+
-+// RUN: %clang -march=c3 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_C3_M32
-+// CHECK_C3_M32: #define __3dNOW__ 1
-+// CHECK_C3_M32: #define __MMX__ 1
-+// CHECK_C3_M32: #define __i386 1
-+// CHECK_C3_M32: #define __i386__ 1
-+// CHECK_C3_M32: #define __i486 1
-+// CHECK_C3_M32: #define __i486__ 1
-+// CHECK_C3_M32: #define __tune_i486__ 1
-+// CHECK_C3_M32: #define i386 1
-+// RUN: not %clang -march=c3 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_C3_M64
-+// CHECK_C3_M64: error: {{.*}}
-+
-+// RUN: %clang -march=c3-2 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_C3_2_M32
-+// CHECK_C3_2_M32: #define __MMX__ 1
-+// CHECK_C3_2_M32: #define __SSE__ 1
-+// CHECK_C3_2_M32: #define __i386 1
-+// CHECK_C3_2_M32: #define __i386__ 1
-+// CHECK_C3_2_M32: #define __i686 1
-+// CHECK_C3_2_M32: #define __i686__ 1
-+// CHECK_C3_2_M32: #define __pentiumpro 1
-+// CHECK_C3_2_M32: #define __pentiumpro__ 1
-+// CHECK_C3_2_M32: #define __tune_i686__ 1
-+// CHECK_C3_2_M32: #define __tune_pentium2__ 1
-+// CHECK_C3_2_M32: #define __tune_pentiumpro__ 1
-+// CHECK_C3_2_M32: #define i386 1
-+// RUN: not %clang -march=c3-2 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_C3_2_M64
-+// CHECK_C3_2_M64: error: {{.*}}
-+
-+// RUN: %clang -march=i686 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_I686_M32
-+// CHECK_I686_M32: #define __i386 1
-+// CHECK_I686_M32: #define __i386__ 1
-+// CHECK_I686_M32: #define __i686 1
-+// CHECK_I686_M32: #define __i686__ 1
-+// CHECK_I686_M32: #define __pentiumpro 1
-+// CHECK_I686_M32: #define __pentiumpro__ 1
-+// CHECK_I686_M32: #define __tune_i686__ 1
-+// CHECK_I686_M32: #define __tune_pentiumpro__ 1
-+// CHECK_I686_M32: #define i386 1
-+// RUN: not %clang -march=i686 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_I686_M64
-+// CHECK_I686_M64: error: {{.*}}
-+
-+// RUN: %clang -march=pentiumpro -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUMPRO_M32
-+// CHECK_PENTIUMPRO_M32: #define __i386 1
-+// CHECK_PENTIUMPRO_M32: #define __i386__ 1
-+// CHECK_PENTIUMPRO_M32: #define __i686 1
-+// CHECK_PENTIUMPRO_M32: #define __i686__ 1
-+// CHECK_PENTIUMPRO_M32: #define __pentiumpro 1
-+// CHECK_PENTIUMPRO_M32: #define __pentiumpro__ 1
-+// CHECK_PENTIUMPRO_M32: #define __tune_i686__ 1
-+// CHECK_PENTIUMPRO_M32: #define __tune_pentiumpro__ 1
-+// CHECK_PENTIUMPRO_M32: #define i386 1
-+// RUN: not %clang -march=pentiumpro -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUMPRO_M64
-+// CHECK_PENTIUMPRO_M64: error: {{.*}}
-+
-+// RUN: %clang -march=pentium2 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM2_M32
-+// CHECK_PENTIUM2_M32: #define __FXSR__ 1
-+// CHECK_PENTIUM2_M32: #define __MMX__ 1
-+// CHECK_PENTIUM2_M32: #define __i386 1
-+// CHECK_PENTIUM2_M32: #define __i386__ 1
-+// CHECK_PENTIUM2_M32: #define __i686 1
-+// CHECK_PENTIUM2_M32: #define __i686__ 1
-+// CHECK_PENTIUM2_M32: #define __pentiumpro 1
-+// CHECK_PENTIUM2_M32: #define __pentiumpro__ 1
-+// CHECK_PENTIUM2_M32: #define __tune_i686__ 1
-+// CHECK_PENTIUM2_M32: #define __tune_pentium2__ 1
-+// CHECK_PENTIUM2_M32: #define __tune_pentiumpro__ 1
-+// CHECK_PENTIUM2_M32: #define i386 1
-+// RUN: not %clang -march=pentium2 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM2_M64
-+// CHECK_PENTIUM2_M64: error: {{.*}}
-+
-+// RUN: %clang -march=pentium3 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM3_M32
-+// CHECK_PENTIUM3_M32: #define __MMX__ 1
-+// CHECK_PENTIUM3_M32: #define __SSE__ 1
-+// CHECK_PENTIUM3_M32: #define __i386 1
-+// CHECK_PENTIUM3_M32: #define __i386__ 1
-+// CHECK_PENTIUM3_M32: #define __i686 1
-+// CHECK_PENTIUM3_M32: #define __i686__ 1
-+// CHECK_PENTIUM3_M32: #define __pentiumpro 1
-+// CHECK_PENTIUM3_M32: #define __pentiumpro__ 1
-+// CHECK_PENTIUM3_M32: #define __tune_i686__ 1
-+// CHECK_PENTIUM3_M32: #define __tune_pentium2__ 1
-+// CHECK_PENTIUM3_M32: #define __tune_pentium3__ 1
-+// CHECK_PENTIUM3_M32: #define __tune_pentiumpro__ 1
-+// CHECK_PENTIUM3_M32: #define i386 1
-+// RUN: not %clang -march=pentium3 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM3_M64
-+// CHECK_PENTIUM3_M64: error: {{.*}}
-+
-+// RUN: %clang -march=pentium3m -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM3M_M32
-+// CHECK_PENTIUM3M_M32: #define __MMX__ 1
-+// CHECK_PENTIUM3M_M32: #define __SSE__ 1
-+// CHECK_PENTIUM3M_M32: #define __i386 1
-+// CHECK_PENTIUM3M_M32: #define __i386__ 1
-+// CHECK_PENTIUM3M_M32: #define __i686 1
-+// CHECK_PENTIUM3M_M32: #define __i686__ 1
-+// CHECK_PENTIUM3M_M32: #define __pentiumpro 1
-+// CHECK_PENTIUM3M_M32: #define __pentiumpro__ 1
-+// CHECK_PENTIUM3M_M32: #define __tune_i686__ 1
-+// CHECK_PENTIUM3M_M32: #define __tune_pentiumpro__ 1
-+// CHECK_PENTIUM3M_M32: #define i386 1
-+// RUN: not %clang -march=pentium3m -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM3M_M64
-+// CHECK_PENTIUM3M_M64: error: {{.*}}
-+
-+// RUN: %clang -march=pentium-m -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_M_M32
-+// CHECK_PENTIUM_M_M32: #define __MMX__ 1
-+// CHECK_PENTIUM_M_M32: #define __SSE2__ 1
-+// CHECK_PENTIUM_M_M32: #define __SSE__ 1
-+// CHECK_PENTIUM_M_M32: #define __i386 1
-+// CHECK_PENTIUM_M_M32: #define __i386__ 1
-+// CHECK_PENTIUM_M_M32: #define __i686 1
-+// CHECK_PENTIUM_M_M32: #define __i686__ 1
-+// CHECK_PENTIUM_M_M32: #define __pentiumpro 1
-+// CHECK_PENTIUM_M_M32: #define __pentiumpro__ 1
-+// CHECK_PENTIUM_M_M32: #define __tune_i686__ 1
-+// CHECK_PENTIUM_M_M32: #define __tune_pentiumpro__ 1
-+// CHECK_PENTIUM_M_M32: #define i386 1
-+// RUN: not %clang -march=pentium-m -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_M_M64
-+// CHECK_PENTIUM_M_M64: error: {{.*}}
-+
-+// RUN: %clang -march=pentium4 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM4_M32
-+// CHECK_PENTIUM4_M32: #define __MMX__ 1
-+// CHECK_PENTIUM4_M32: #define __SSE2__ 1
-+// CHECK_PENTIUM4_M32: #define __SSE__ 1
-+// CHECK_PENTIUM4_M32: #define __i386 1
-+// CHECK_PENTIUM4_M32: #define __i386__ 1
-+// CHECK_PENTIUM4_M32: #define __pentium4 1
-+// CHECK_PENTIUM4_M32: #define __pentium4__ 1
-+// CHECK_PENTIUM4_M32: #define __tune_pentium4__ 1
-+// CHECK_PENTIUM4_M32: #define i386 1
-+// RUN: not %clang -march=pentium4 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM4_M64
-+// CHECK_PENTIUM4_M64: error: {{.*}}
-+
-+// RUN: %clang -march=pentium4m -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM4M_M32
-+// CHECK_PENTIUM4M_M32: #define __MMX__ 1
-+// CHECK_PENTIUM4M_M32: #define __SSE2__ 1
-+// CHECK_PENTIUM4M_M32: #define __SSE__ 1
-+// CHECK_PENTIUM4M_M32: #define __i386 1
-+// CHECK_PENTIUM4M_M32: #define __i386__ 1
-+// CHECK_PENTIUM4M_M32: #define __pentium4 1
-+// CHECK_PENTIUM4M_M32: #define __pentium4__ 1
-+// CHECK_PENTIUM4M_M32: #define __tune_pentium4__ 1
-+// CHECK_PENTIUM4M_M32: #define i386 1
-+// RUN: not %clang -march=pentium4m -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM4M_M64
-+// CHECK_PENTIUM4M_M64: error: {{.*}}
-+
-+// RUN: %clang -march=yonah -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_YONAH_M32
-+// CHECK_YONAH_M32: #define __MMX__ 1
-+// CHECK_YONAH_M32: #define __SSE2__ 1
-+// CHECK_YONAH_M32: #define __SSE3__ 1
-+// CHECK_YONAH_M32: #define __SSE__ 1
-+// CHECK_YONAH_M32: #define __i386 1
-+// CHECK_YONAH_M32: #define __i386__ 1
-+// CHECK_YONAH_M32: #define __nocona 1
-+// CHECK_YONAH_M32: #define __nocona__ 1
-+// CHECK_YONAH_M32: #define __tune_nocona__ 1
-+// CHECK_YONAH_M32: #define i386 1
-+// RUN: not %clang -march=yonah -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_YONAH_M64
-+// CHECK_YONAH_M64: error: {{.*}}
-+
-+// RUN: %clang -march=prescott -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PRESCOTT_M32
-+// CHECK_PRESCOTT_M32: #define __MMX__ 1
-+// CHECK_PRESCOTT_M32: #define __SSE2__ 1
-+// CHECK_PRESCOTT_M32: #define __SSE3__ 1
-+// CHECK_PRESCOTT_M32: #define __SSE__ 1
-+// CHECK_PRESCOTT_M32: #define __i386 1
-+// CHECK_PRESCOTT_M32: #define __i386__ 1
-+// CHECK_PRESCOTT_M32: #define __nocona 1
-+// CHECK_PRESCOTT_M32: #define __nocona__ 1
-+// CHECK_PRESCOTT_M32: #define __tune_nocona__ 1
-+// CHECK_PRESCOTT_M32: #define i386 1
-+// RUN: not %clang -march=prescott -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PRESCOTT_M64
-+// CHECK_PRESCOTT_M64: error: {{.*}}
-+
-+// RUN: %clang -march=nocona -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_NOCONA_M32
-+// CHECK_NOCONA_M32: #define __MMX__ 1
-+// CHECK_NOCONA_M32: #define __SSE2__ 1
-+// CHECK_NOCONA_M32: #define __SSE3__ 1
-+// CHECK_NOCONA_M32: #define __SSE__ 1
-+// CHECK_NOCONA_M32: #define __i386 1
-+// CHECK_NOCONA_M32: #define __i386__ 1
-+// CHECK_NOCONA_M32: #define __nocona 1
-+// CHECK_NOCONA_M32: #define __nocona__ 1
-+// CHECK_NOCONA_M32: #define __tune_nocona__ 1
-+// CHECK_NOCONA_M32: #define i386 1
-+// RUN: %clang -march=nocona -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_NOCONA_M64
-+// CHECK_NOCONA_M64: #define __MMX__ 1
-+// CHECK_NOCONA_M64: #define __SSE2_MATH__ 1
-+// CHECK_NOCONA_M64: #define __SSE2__ 1
-+// CHECK_NOCONA_M64: #define __SSE3__ 1
-+// CHECK_NOCONA_M64: #define __SSE_MATH__ 1
-+// CHECK_NOCONA_M64: #define __SSE__ 1
-+// CHECK_NOCONA_M64: #define __amd64 1
-+// CHECK_NOCONA_M64: #define __amd64__ 1
-+// CHECK_NOCONA_M64: #define __nocona 1
-+// CHECK_NOCONA_M64: #define __nocona__ 1
-+// CHECK_NOCONA_M64: #define __tune_nocona__ 1
-+// CHECK_NOCONA_M64: #define __x86_64 1
-+// CHECK_NOCONA_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=core2 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE2_M32
-+// CHECK_CORE2_M32: #define __MMX__ 1
-+// CHECK_CORE2_M32: #define __SSE2__ 1
-+// CHECK_CORE2_M32: #define __SSE3__ 1
-+// CHECK_CORE2_M32: #define __SSE__ 1
-+// CHECK_CORE2_M32: #define __SSSE3__ 1
-+// CHECK_CORE2_M32: #define __core2 1
-+// CHECK_CORE2_M32: #define __core2__ 1
-+// CHECK_CORE2_M32: #define __i386 1
-+// CHECK_CORE2_M32: #define __i386__ 1
-+// CHECK_CORE2_M32: #define __tune_core2__ 1
-+// CHECK_CORE2_M32: #define i386 1
-+
-+// RUN: %clang -march=core2 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE2_M64
-+// CHECK_CORE2_M64: #define __MMX__ 1
-+// CHECK_CORE2_M64: #define __SSE2_MATH__ 1
-+// CHECK_CORE2_M64: #define __SSE2__ 1
-+// CHECK_CORE2_M64: #define __SSE3__ 1
-+// CHECK_CORE2_M64: #define __SSE_MATH__ 1
-+// CHECK_CORE2_M64: #define __SSE__ 1
-+// CHECK_CORE2_M64: #define __SSSE3__ 1
-+// CHECK_CORE2_M64: #define __amd64 1
-+// CHECK_CORE2_M64: #define __amd64__ 1
-+// CHECK_CORE2_M64: #define __core2 1
-+// CHECK_CORE2_M64: #define __core2__ 1
-+// CHECK_CORE2_M64: #define __tune_core2__ 1
-+// CHECK_CORE2_M64: #define __x86_64 1
-+// CHECK_CORE2_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=corei7 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_COREI7_M32
-+// CHECK_COREI7_M32: #define __MMX__ 1
-+// CHECK_COREI7_M32: #define __POPCNT__ 1
-+// CHECK_COREI7_M32: #define __SSE2__ 1
-+// CHECK_COREI7_M32: #define __SSE3__ 1
-+// CHECK_COREI7_M32: #define __SSE4_1__ 1
-+// CHECK_COREI7_M32: #define __SSE4_2__ 1
-+// CHECK_COREI7_M32: #define __SSE__ 1
-+// CHECK_COREI7_M32: #define __SSSE3__ 1
-+// CHECK_COREI7_M32: #define __corei7 1
-+// CHECK_COREI7_M32: #define __corei7__ 1
-+// CHECK_COREI7_M32: #define __i386 1
-+// CHECK_COREI7_M32: #define __i386__ 1
-+// CHECK_COREI7_M32: #define __tune_corei7__ 1
-+// CHECK_COREI7_M32: #define i386 1
-+
-+// RUN: %clang -march=corei7 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_COREI7_M64
-+// CHECK_COREI7_M64: #define __MMX__ 1
-+// CHECK_COREI7_M64: #define __POPCNT__ 1
-+// CHECK_COREI7_M64: #define __SSE2_MATH__ 1
-+// CHECK_COREI7_M64: #define __SSE2__ 1
-+// CHECK_COREI7_M64: #define __SSE3__ 1
-+// CHECK_COREI7_M64: #define __SSE4_1__ 1
-+// CHECK_COREI7_M64: #define __SSE4_2__ 1
-+// CHECK_COREI7_M64: #define __SSE_MATH__ 1
-+// CHECK_COREI7_M64: #define __SSE__ 1
-+// CHECK_COREI7_M64: #define __SSSE3__ 1
-+// CHECK_COREI7_M64: #define __amd64 1
-+// CHECK_COREI7_M64: #define __amd64__ 1
-+// CHECK_COREI7_M64: #define __corei7 1
-+// CHECK_COREI7_M64: #define __corei7__ 1
-+// CHECK_COREI7_M64: #define __tune_corei7__ 1
-+// CHECK_COREI7_M64: #define __x86_64 1
-+// CHECK_COREI7_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=corei7-avx -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_COREI7_AVX_M32
-+// CHECK_COREI7_AVX_M32: #define __AVX__ 1
-+// CHECK_COREI7_AVX_M32: #define __MMX__ 1
-+// CHECK_COREI7_AVX_M32: #define __PCLMUL__ 1
-+// CHECK_COREI7_AVX_M32-NOT: __RDRND__
-+// CHECK_COREI7_AVX_M32: #define __POPCNT__ 1
-+// CHECK_COREI7_AVX_M32: #define __SSE2__ 1
-+// CHECK_COREI7_AVX_M32: #define __SSE3__ 1
-+// CHECK_COREI7_AVX_M32: #define __SSE4_1__ 1
-+// CHECK_COREI7_AVX_M32: #define __SSE4_2__ 1
-+// CHECK_COREI7_AVX_M32: #define __SSE__ 1
-+// CHECK_COREI7_AVX_M32: #define __SSSE3__ 1
-+// CHECK_COREI7_AVX_M32: #define __XSAVEOPT__ 1
-+// CHECK_COREI7_AVX_M32: #define __XSAVE__ 1
-+// CHECK_COREI7_AVX_M32: #define __corei7 1
-+// CHECK_COREI7_AVX_M32: #define __corei7__ 1
-+// CHECK_COREI7_AVX_M32: #define __i386 1
-+// CHECK_COREI7_AVX_M32: #define __i386__ 1
-+// CHECK_COREI7_AVX_M32: #define __tune_corei7__ 1
-+// CHECK_COREI7_AVX_M32: #define i386 1
-+
-+// RUN: %clang -march=corei7-avx -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_COREI7_AVX_M64
-+// CHECK_COREI7_AVX_M64: #define __AVX__ 1
-+// CHECK_COREI7_AVX_M64: #define __MMX__ 1
-+// CHECK_COREI7_AVX_M64: #define __PCLMUL__ 1
-+// CHECK_COREI7_AVX_M64-NOT: __RDRND__
-+// CHECK_COREI7_AVX_M64: #define __POPCNT__ 1
-+// CHECK_COREI7_AVX_M64: #define __SSE2_MATH__ 1
-+// CHECK_COREI7_AVX_M64: #define __SSE2__ 1
-+// CHECK_COREI7_AVX_M64: #define __SSE3__ 1
-+// CHECK_COREI7_AVX_M64: #define __SSE4_1__ 1
-+// CHECK_COREI7_AVX_M64: #define __SSE4_2__ 1
-+// CHECK_COREI7_AVX_M64: #define __SSE_MATH__ 1
-+// CHECK_COREI7_AVX_M64: #define __SSE__ 1
-+// CHECK_COREI7_AVX_M64: #define __SSSE3__ 1
-+// CHECK_COREI7_AVX_M64: #define __XSAVEOPT__ 1
-+// CHECK_COREI7_AVX_M64: #define __XSAVE__ 1
-+// CHECK_COREI7_AVX_M64: #define __amd64 1
-+// CHECK_COREI7_AVX_M64: #define __amd64__ 1
-+// CHECK_COREI7_AVX_M64: #define __corei7 1
-+// CHECK_COREI7_AVX_M64: #define __corei7__ 1
-+// CHECK_COREI7_AVX_M64: #define __tune_corei7__ 1
-+// CHECK_COREI7_AVX_M64: #define __x86_64 1
-+// CHECK_COREI7_AVX_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=core-avx-i -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE_AVX_I_M32
-+// CHECK_CORE_AVX_I_M32: #define __AVX__ 1
-+// CHECK_CORE_AVX_I_M32: #define __F16C__ 1
-+// CHECK_CORE_AVX_I_M32: #define __MMX__ 1
-+// CHECK_CORE_AVX_I_M32: #define __PCLMUL__ 1
-+// CHECK_CORE_AVX_I_M32: #define __RDRND__ 1
-+// CHECK_CORE_AVX_I_M32: #define __SSE2__ 1
-+// CHECK_CORE_AVX_I_M32: #define __SSE3__ 1
-+// CHECK_CORE_AVX_I_M32: #define __SSE4_1__ 1
-+// CHECK_CORE_AVX_I_M32: #define __SSE4_2__ 1
-+// CHECK_CORE_AVX_I_M32: #define __SSE__ 1
-+// CHECK_CORE_AVX_I_M32: #define __SSSE3__ 1
-+// CHECK_CORE_AVX_I_M32: #define __XSAVEOPT__ 1
-+// CHECK_CORE_AVX_I_M32: #define __XSAVE__ 1
-+// CHECK_CORE_AVX_I_M32: #define __corei7 1
-+// CHECK_CORE_AVX_I_M32: #define __corei7__ 1
-+// CHECK_CORE_AVX_I_M32: #define __i386 1
-+// CHECK_CORE_AVX_I_M32: #define __i386__ 1
-+// CHECK_CORE_AVX_I_M32: #define __tune_corei7__ 1
-+// CHECK_CORE_AVX_I_M32: #define i386 1
-+
-+// RUN: %clang -march=core-avx-i -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE_AVX_I_M64
-+// CHECK_CORE_AVX_I_M64: #define __AVX__ 1
-+// CHECK_CORE_AVX_I_M64: #define __F16C__ 1
-+// CHECK_CORE_AVX_I_M64: #define __MMX__ 1
-+// CHECK_CORE_AVX_I_M64: #define __PCLMUL__ 1
-+// CHECK_CORE_AVX_I_M64: #define __RDRND__ 1
-+// CHECK_CORE_AVX_I_M64: #define __SSE2_MATH__ 1
-+// CHECK_CORE_AVX_I_M64: #define __SSE2__ 1
-+// CHECK_CORE_AVX_I_M64: #define __SSE3__ 1
-+// CHECK_CORE_AVX_I_M64: #define __SSE4_1__ 1
-+// CHECK_CORE_AVX_I_M64: #define __SSE4_2__ 1
-+// CHECK_CORE_AVX_I_M64: #define __SSE_MATH__ 1
-+// CHECK_CORE_AVX_I_M64: #define __SSE__ 1
-+// CHECK_CORE_AVX_I_M64: #define __SSSE3__ 1
-+// CHECK_CORE_AVX_I_M64: #define __XSAVEOPT__ 1
-+// CHECK_CORE_AVX_I_M64: #define __XSAVE__ 1
-+// CHECK_CORE_AVX_I_M64: #define __amd64 1
-+// CHECK_CORE_AVX_I_M64: #define __amd64__ 1
-+// CHECK_CORE_AVX_I_M64: #define __corei7 1
-+// CHECK_CORE_AVX_I_M64: #define __corei7__ 1
-+// CHECK_CORE_AVX_I_M64: #define __tune_corei7__ 1
-+// CHECK_CORE_AVX_I_M64: #define __x86_64 1
-+// CHECK_CORE_AVX_I_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=core-avx2 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE_AVX2_M32
-+// CHECK_CORE_AVX2_M32: #define __AVX2__ 1
-+// CHECK_CORE_AVX2_M32: #define __AVX__ 1
-+// CHECK_CORE_AVX2_M32: #define __BMI2__ 1
-+// CHECK_CORE_AVX2_M32: #define __BMI__ 1
-+// CHECK_CORE_AVX2_M32: #define __F16C__ 1
-+// CHECK_CORE_AVX2_M32: #define __FMA__ 1
-+// CHECK_CORE_AVX2_M32: #define __INVPCID__ 1
-+// CHECK_CORE_AVX2_M32: #define __LAHF_SAHF__ 1
-+// CHECK_CORE_AVX2_M32: #define __LZCNT__ 1
-+// CHECK_CORE_AVX2_M32: #define __MMX__ 1
-+// CHECK_CORE_AVX2_M32: #define __MOVBE__ 1
-+// CHECK_CORE_AVX2_M32: #define __PCLMUL__ 1
-+// CHECK_CORE_AVX2_M32: #define __POPCNT__ 1
-+// CHECK_CORE_AVX2_M32: #define __RDRND__ 1
-+// CHECK_CORE_AVX2_M32: #define __SSE2__ 1
-+// CHECK_CORE_AVX2_M32: #define __SSE3__ 1
-+// CHECK_CORE_AVX2_M32: #define __SSE4_1__ 1
-+// CHECK_CORE_AVX2_M32: #define __SSE4_2__ 1
-+// CHECK_CORE_AVX2_M32: #define __SSE__ 1
-+// CHECK_CORE_AVX2_M32: #define __SSSE3__ 1
-+// CHECK_CORE_AVX2_M32: #define __XSAVEOPT__ 1
-+// CHECK_CORE_AVX2_M32: #define __XSAVE__ 1
-+// CHECK_CORE_AVX2_M32: #define __corei7 1
-+// CHECK_CORE_AVX2_M32: #define __corei7__ 1
-+// CHECK_CORE_AVX2_M32: #define __i386 1
-+// CHECK_CORE_AVX2_M32: #define __i386__ 1
-+// CHECK_CORE_AVX2_M32: #define __tune_corei7__ 1
-+// CHECK_CORE_AVX2_M32: #define i386 1
-+
-+// RUN: %clang -march=core-avx2 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE_AVX2_M64
-+// CHECK_CORE_AVX2_M64: #define __AVX2__ 1
-+// CHECK_CORE_AVX2_M64: #define __AVX__ 1
-+// CHECK_CORE_AVX2_M64: #define __BMI2__ 1
-+// CHECK_CORE_AVX2_M64: #define __BMI__ 1
-+// CHECK_CORE_AVX2_M64: #define __F16C__ 1
-+// CHECK_CORE_AVX2_M64: #define __FMA__ 1
-+// CHECK_CORE_AVX2_M64: #define __INVPCID__ 1
-+// CHECK_CORE_AVX2_M64: #define __LAHF_SAHF__ 1
-+// CHECK_CORE_AVX2_M64: #define __LZCNT__ 1
-+// CHECK_CORE_AVX2_M64: #define __MMX__ 1
-+// CHECK_CORE_AVX2_M64: #define __MOVBE__ 1
-+// CHECK_CORE_AVX2_M64: #define __PCLMUL__ 1
-+// CHECK_CORE_AVX2_M64: #define __POPCNT__ 1
-+// CHECK_CORE_AVX2_M64: #define __RDRND__ 1
-+// CHECK_CORE_AVX2_M64: #define __SSE2_MATH__ 1
-+// CHECK_CORE_AVX2_M64: #define __SSE2__ 1
-+// CHECK_CORE_AVX2_M64: #define __SSE3__ 1
-+// CHECK_CORE_AVX2_M64: #define __SSE4_1__ 1
-+// CHECK_CORE_AVX2_M64: #define __SSE4_2__ 1
-+// CHECK_CORE_AVX2_M64: #define __SSE_MATH__ 1
-+// CHECK_CORE_AVX2_M64: #define __SSE__ 1
-+// CHECK_CORE_AVX2_M64: #define __SSSE3__ 1
-+// CHECK_CORE_AVX2_M64: #define __XSAVEOPT__ 1
-+// CHECK_CORE_AVX2_M64: #define __XSAVE__ 1
-+// CHECK_CORE_AVX2_M64: #define __amd64 1
-+// CHECK_CORE_AVX2_M64: #define __amd64__ 1
-+// CHECK_CORE_AVX2_M64: #define __corei7 1
-+// CHECK_CORE_AVX2_M64: #define __corei7__ 1
-+// CHECK_CORE_AVX2_M64: #define __tune_corei7__ 1
-+// CHECK_CORE_AVX2_M64: #define __x86_64 1
-+// CHECK_CORE_AVX2_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=broadwell -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BROADWELL_M32
-+// CHECK_BROADWELL_M32: #define __ADX__ 1
-+// CHECK_BROADWELL_M32: #define __AVX2__ 1
-+// CHECK_BROADWELL_M32: #define __AVX__ 1
-+// CHECK_BROADWELL_M32: #define __BMI2__ 1
-+// CHECK_BROADWELL_M32: #define __BMI__ 1
-+// CHECK_BROADWELL_M32: #define __F16C__ 1
-+// CHECK_BROADWELL_M32: #define __FMA__ 1
-+// CHECK_BROADWELL_M32: #define __INVPCID__ 1
-+// CHECK_BROADWELL_M32: #define __LAHF_SAHF__ 1
-+// CHECK_BROADWELL_M32: #define __LZCNT__ 1
-+// CHECK_BROADWELL_M32: #define __MMX__ 1
-+// CHECK_BROADWELL_M32: #define __MOVBE__ 1
-+// CHECK_BROADWELL_M32: #define __PCLMUL__ 1
-+// CHECK_BROADWELL_M32: #define __POPCNT__ 1
-+// CHECK_BROADWELL_M32: #define __PRFCHW__ 1
-+// CHECK_BROADWELL_M32: #define __RDRND__ 1
-+// CHECK_BROADWELL_M32: #define __RDSEED__ 1
-+// CHECK_BROADWELL_M32: #define __SSE2__ 1
-+// CHECK_BROADWELL_M32: #define __SSE3__ 1
-+// CHECK_BROADWELL_M32: #define __SSE4_1__ 1
-+// CHECK_BROADWELL_M32: #define __SSE4_2__ 1
-+// CHECK_BROADWELL_M32: #define __SSE__ 1
-+// CHECK_BROADWELL_M32: #define __SSSE3__ 1
-+// CHECK_BROADWELL_M32: #define __XSAVEOPT__ 1
-+// CHECK_BROADWELL_M32: #define __XSAVE__ 1
-+// CHECK_BROADWELL_M32: #define __corei7 1
-+// CHECK_BROADWELL_M32: #define __corei7__ 1
-+// CHECK_BROADWELL_M32: #define __i386 1
-+// CHECK_BROADWELL_M32: #define __i386__ 1
-+// CHECK_BROADWELL_M32: #define __tune_corei7__ 1
-+// CHECK_BROADWELL_M32: #define i386 1
-+
-+// RUN: %clang -march=broadwell -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BROADWELL_M64
-+// CHECK_BROADWELL_M64: #define __ADX__ 1
-+// CHECK_BROADWELL_M64: #define __AVX2__ 1
-+// CHECK_BROADWELL_M64: #define __AVX__ 1
-+// CHECK_BROADWELL_M64: #define __BMI2__ 1
-+// CHECK_BROADWELL_M64: #define __BMI__ 1
-+// CHECK_BROADWELL_M64: #define __F16C__ 1
-+// CHECK_BROADWELL_M64: #define __FMA__ 1
-+// CHECK_BROADWELL_M64: #define __INVPCID__ 1
-+// CHECK_BROADWELL_M64: #define __LAHF_SAHF__ 1
-+// CHECK_BROADWELL_M64: #define __LZCNT__ 1
-+// CHECK_BROADWELL_M64: #define __MMX__ 1
-+// CHECK_BROADWELL_M64: #define __MOVBE__ 1
-+// CHECK_BROADWELL_M64: #define __PCLMUL__ 1
-+// CHECK_BROADWELL_M64: #define __POPCNT__ 1
-+// CHECK_BROADWELL_M64: #define __PRFCHW__ 1
-+// CHECK_BROADWELL_M64: #define __RDRND__ 1
-+// CHECK_BROADWELL_M64: #define __RDSEED__ 1
-+// CHECK_BROADWELL_M64: #define __SSE2_MATH__ 1
-+// CHECK_BROADWELL_M64: #define __SSE2__ 1
-+// CHECK_BROADWELL_M64: #define __SSE3__ 1
-+// CHECK_BROADWELL_M64: #define __SSE4_1__ 1
-+// CHECK_BROADWELL_M64: #define __SSE4_2__ 1
-+// CHECK_BROADWELL_M64: #define __SSE_MATH__ 1
-+// CHECK_BROADWELL_M64: #define __SSE__ 1
-+// CHECK_BROADWELL_M64: #define __SSSE3__ 1
-+// CHECK_BROADWELL_M64: #define __XSAVEOPT__ 1
-+// CHECK_BROADWELL_M64: #define __XSAVE__ 1
-+// CHECK_BROADWELL_M64: #define __amd64 1
-+// CHECK_BROADWELL_M64: #define __amd64__ 1
-+// CHECK_BROADWELL_M64: #define __corei7 1
-+// CHECK_BROADWELL_M64: #define __corei7__ 1
-+// CHECK_BROADWELL_M64: #define __tune_corei7__ 1
-+// CHECK_BROADWELL_M64: #define __x86_64 1
-+// CHECK_BROADWELL_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=skylake -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SKL_M32
-+// CHECK_SKL_M32: #define __ADX__ 1
-+// CHECK_SKL_M32: #define __AES__ 1
-+// CHECK_SKL_M32: #define __AVX2__ 1
-+// CHECK_SKL_M32: #define __AVX__ 1
-+// CHECK_SKL_M32: #define __BMI2__ 1
-+// CHECK_SKL_M32: #define __BMI__ 1
-+// CHECK_SKL_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_SKL_M32: #define __F16C__ 1
-+// CHECK_SKL_M32: #define __FMA__ 1
-+// CHECK_SKL_M32: #define __INVPCID__ 1
-+// CHECK_SKL_M32: #define __LZCNT__ 1
-+// CHECK_SKL_M32: #define __MMX__ 1
-+// CHECK_SKL_M32: #define __MOVBE__ 1
-+// CHECK_SKL_M32: #define __PCLMUL__ 1
-+// CHECK_SKL_M32: #define __POPCNT__ 1
-+// CHECK_SKL_M32: #define __PRFCHW__ 1
-+// CHECK_SKL_M32: #define __RDRND__ 1
-+// CHECK_SKL_M32: #define __RDSEED__ 1
-+// CHECK_SKL_M32: #define __SGX__ 1
-+// CHECK_SKL_M32: #define __SSE2__ 1
-+// CHECK_SKL_M32: #define __SSE3__ 1
-+// CHECK_SKL_M32: #define __SSE4_1__ 1
-+// CHECK_SKL_M32: #define __SSE4_2__ 1
-+// CHECK_SKL_M32: #define __SSE__ 1
-+// CHECK_SKL_M32: #define __SSSE3__ 1
-+// CHECK_SKL_M32: #define __XSAVEC__ 1
-+// CHECK_SKL_M32: #define __XSAVEOPT__ 1
-+// CHECK_SKL_M32: #define __XSAVES__ 1
-+// CHECK_SKL_M32: #define __XSAVE__ 1
-+// CHECK_SKL_M32: #define i386 1
-+
-+// RUN: %clang -march=skylake -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SKL_M64
-+// CHECK_SKL_M64: #define __ADX__ 1
-+// CHECK_SKL_M64: #define __AES__ 1
-+// CHECK_SKL_M64: #define __AVX2__ 1
-+// CHECK_SKL_M64: #define __AVX__ 1
-+// CHECK_SKL_M64: #define __BMI2__ 1
-+// CHECK_SKL_M64: #define __BMI__ 1
-+// CHECK_SKL_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_SKL_M64: #define __F16C__ 1
-+// CHECK_SKL_M64: #define __FMA__ 1
-+// CHECK_SKL_M64: #define __INVPCID__ 1
-+// CHECK_SKL_M64: #define __LZCNT__ 1
-+// CHECK_SKL_M64: #define __MMX__ 1
-+// CHECK_SKL_M64: #define __MOVBE__ 1
-+// CHECK_SKL_M64: #define __PCLMUL__ 1
-+// CHECK_SKL_M64: #define __POPCNT__ 1
-+// CHECK_SKL_M64: #define __PRFCHW__ 1
-+// CHECK_SKL_M64: #define __RDRND__ 1
-+// CHECK_SKL_M64: #define __RDSEED__ 1
-+// CHECK_SKL_M64: #define __SGX__ 1
-+// CHECK_SKL_M64: #define __SSE2_MATH__ 1
-+// CHECK_SKL_M64: #define __SSE2__ 1
-+// CHECK_SKL_M64: #define __SSE3__ 1
-+// CHECK_SKL_M64: #define __SSE4_1__ 1
-+// CHECK_SKL_M64: #define __SSE4_2__ 1
-+// CHECK_SKL_M64: #define __SSE_MATH__ 1
-+// CHECK_SKL_M64: #define __SSE__ 1
-+// CHECK_SKL_M64: #define __SSSE3__ 1
-+// CHECK_SKL_M64: #define __XSAVEC__ 1
-+// CHECK_SKL_M64: #define __XSAVEOPT__ 1
-+// CHECK_SKL_M64: #define __XSAVES__ 1
-+// CHECK_SKL_M64: #define __XSAVE__ 1
-+// CHECK_SKL_M64: #define __amd64 1
-+// CHECK_SKL_M64: #define __amd64__ 1
-+// CHECK_SKL_M64: #define __x86_64 1
-+// CHECK_SKL_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=knl -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_KNL_M32
-+// CHECK_KNL_M32: #define __AES__ 1
-+// CHECK_KNL_M32: #define __AVX2__ 1
-+// CHECK_KNL_M32: #define __AVX512CD__ 1
-+// CHECK_KNL_M32: #define __AVX512ER__ 1
-+// CHECK_KNL_M32: #define __AVX512F__ 1
-+// CHECK_KNL_M32: #define __AVX512PF__ 1
-+// CHECK_KNL_M32: #define __AVX__ 1
-+// CHECK_KNL_M32: #define __BMI2__ 1
-+// CHECK_KNL_M32: #define __BMI__ 1
-+// CHECK_KNL_M32: #define __F16C__ 1
-+// CHECK_KNL_M32: #define __FMA__ 1
-+// CHECK_KNL_M32: #define __LZCNT__ 1
-+// CHECK_KNL_M32: #define __MMX__ 1
-+// CHECK_KNL_M32: #define __MOVBE__ 1
-+// CHECK_KNL_M32: #define __PCLMUL__ 1
-+// CHECK_KNL_M32: #define __POPCNT__ 1
-+// CHECK_KNL_M32: #define __PREFETCHWT1__ 1
-+// CHECK_KNL_M32: #define __PRFCHW__ 1
-+// CHECK_KNL_M32: #define __RDRND__ 1
-+// CHECK_KNL_M32: #define __SSE2__ 1
-+// CHECK_KNL_M32: #define __SSE3__ 1
-+// CHECK_KNL_M32: #define __SSE4_1__ 1
-+// CHECK_KNL_M32: #define __SSE4_2__ 1
-+// CHECK_KNL_M32: #define __SSE__ 1
-+// CHECK_KNL_M32: #define __SSSE3__ 1
-+// CHECK_KNL_M32: #define __XSAVEOPT__ 1
-+// CHECK_KNL_M32: #define __XSAVE__ 1
-+// CHECK_KNL_M32: #define __i386 1
-+// CHECK_KNL_M32: #define __i386__ 1
-+// CHECK_KNL_M32: #define __knl 1
-+// CHECK_KNL_M32: #define __knl__ 1
-+// CHECK_KNL_M32: #define __tune_knl__ 1
-+// CHECK_KNL_M32: #define i386 1
-+
-+// RUN: %clang -march=knl -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_KNL_M64
-+// CHECK_KNL_M64: #define __AES__ 1
-+// CHECK_KNL_M64: #define __AVX2__ 1
-+// CHECK_KNL_M64: #define __AVX512CD__ 1
-+// CHECK_KNL_M64: #define __AVX512ER__ 1
-+// CHECK_KNL_M64: #define __AVX512F__ 1
-+// CHECK_KNL_M64: #define __AVX512PF__ 1
-+// CHECK_KNL_M64: #define __AVX__ 1
-+// CHECK_KNL_M64: #define __BMI2__ 1
-+// CHECK_KNL_M64: #define __BMI__ 1
-+// CHECK_KNL_M64: #define __F16C__ 1
-+// CHECK_KNL_M64: #define __FMA__ 1
-+// CHECK_KNL_M64: #define __LZCNT__ 1
-+// CHECK_KNL_M64: #define __MMX__ 1
-+// CHECK_KNL_M64: #define __MOVBE__ 1
-+// CHECK_KNL_M64: #define __PCLMUL__ 1
-+// CHECK_KNL_M64: #define __POPCNT__ 1
-+// CHECK_KNL_M64: #define __PREFETCHWT1__ 1
-+// CHECK_KNL_M64: #define __PRFCHW__ 1
-+// CHECK_KNL_M64: #define __RDRND__ 1
-+// CHECK_KNL_M64: #define __SSE2_MATH__ 1
-+// CHECK_KNL_M64: #define __SSE2__ 1
-+// CHECK_KNL_M64: #define __SSE3__ 1
-+// CHECK_KNL_M64: #define __SSE4_1__ 1
-+// CHECK_KNL_M64: #define __SSE4_2__ 1
-+// CHECK_KNL_M64: #define __SSE_MATH__ 1
-+// CHECK_KNL_M64: #define __SSE__ 1
-+// CHECK_KNL_M64: #define __SSSE3__ 1
-+// CHECK_KNL_M64: #define __XSAVEOPT__ 1
-+// CHECK_KNL_M64: #define __XSAVE__ 1
-+// CHECK_KNL_M64: #define __amd64 1
-+// CHECK_KNL_M64: #define __amd64__ 1
-+// CHECK_KNL_M64: #define __knl 1
-+// CHECK_KNL_M64: #define __knl__ 1
-+// CHECK_KNL_M64: #define __tune_knl__ 1
-+// CHECK_KNL_M64: #define __x86_64 1
-+// CHECK_KNL_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=knm -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_KNM_M32
-+// CHECK_KNM_M32: #define __AES__ 1
-+// CHECK_KNM_M32: #define __AVX2__ 1
-+// CHECK_KNM_M32: #define __AVX512CD__ 1
-+// CHECK_KNM_M32: #define __AVX512ER__ 1
-+// CHECK_KNM_M32: #define __AVX512F__ 1
-+// CHECK_KNM_M32: #define __AVX512PF__ 1
-+// CHECK_KNM_M32: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_KNM_M32: #define __AVX__ 1
-+// CHECK_KNM_M32: #define __BMI2__ 1
-+// CHECK_KNM_M32: #define __BMI__ 1
-+// CHECK_KNM_M32: #define __F16C__ 1
-+// CHECK_KNM_M32: #define __FMA__ 1
-+// CHECK_KNM_M32: #define __LZCNT__ 1
-+// CHECK_KNM_M32: #define __MMX__ 1
-+// CHECK_KNM_M32: #define __MOVBE__ 1
-+// CHECK_KNM_M32: #define __PCLMUL__ 1
-+// CHECK_KNM_M32: #define __POPCNT__ 1
-+// CHECK_KNM_M32: #define __PREFETCHWT1__ 1
-+// CHECK_KNM_M32: #define __PRFCHW__ 1
-+// CHECK_KNM_M32: #define __RDRND__ 1
-+// CHECK_KNM_M32: #define __SSE2__ 1
-+// CHECK_KNM_M32: #define __SSE3__ 1
-+// CHECK_KNM_M32: #define __SSE4_1__ 1
-+// CHECK_KNM_M32: #define __SSE4_2__ 1
-+// CHECK_KNM_M32: #define __SSE__ 1
-+// CHECK_KNM_M32: #define __SSSE3__ 1
-+// CHECK_KNM_M32: #define __XSAVEOPT__ 1
-+// CHECK_KNM_M32: #define __XSAVE__ 1
-+// CHECK_KNM_M32: #define __i386 1
-+// CHECK_KNM_M32: #define __i386__ 1
-+// CHECK_KNM_M32: #define i386 1
-+
-+// RUN: %clang -march=knm -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_KNM_M64
-+// CHECK_KNM_M64: #define __AES__ 1
-+// CHECK_KNM_M64: #define __AVX2__ 1
-+// CHECK_KNM_M64: #define __AVX512CD__ 1
-+// CHECK_KNM_M64: #define __AVX512ER__ 1
-+// CHECK_KNM_M64: #define __AVX512F__ 1
-+// CHECK_KNM_M64: #define __AVX512PF__ 1
-+// CHECK_KNM_M64: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_KNM_M64: #define __AVX__ 1
-+// CHECK_KNM_M64: #define __BMI2__ 1
-+// CHECK_KNM_M64: #define __BMI__ 1
-+// CHECK_KNM_M64: #define __F16C__ 1
-+// CHECK_KNM_M64: #define __FMA__ 1
-+// CHECK_KNM_M64: #define __LZCNT__ 1
-+// CHECK_KNM_M64: #define __MMX__ 1
-+// CHECK_KNM_M64: #define __MOVBE__ 1
-+// CHECK_KNM_M64: #define __PCLMUL__ 1
-+// CHECK_KNM_M64: #define __POPCNT__ 1
-+// CHECK_KNM_M64: #define __PREFETCHWT1__ 1
-+// CHECK_KNM_M64: #define __PRFCHW__ 1
-+// CHECK_KNM_M64: #define __RDRND__ 1
-+// CHECK_KNM_M64: #define __SSE2_MATH__ 1
-+// CHECK_KNM_M64: #define __SSE2__ 1
-+// CHECK_KNM_M64: #define __SSE3__ 1
-+// CHECK_KNM_M64: #define __SSE4_1__ 1
-+// CHECK_KNM_M64: #define __SSE4_2__ 1
-+// CHECK_KNM_M64: #define __SSE_MATH__ 1
-+// CHECK_KNM_M64: #define __SSE__ 1
-+// CHECK_KNM_M64: #define __SSSE3__ 1
-+// CHECK_KNM_M64: #define __XSAVEOPT__ 1
-+// CHECK_KNM_M64: #define __XSAVE__ 1
-+// CHECK_KNM_M64: #define __amd64 1
-+// CHECK_KNM_M64: #define __amd64__ 1
-+// CHECK_KNM_M64: #define __x86_64 1
-+// CHECK_KNM_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=skylake-avx512 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SKX_M32
-+// CHECK_SKX_M32: #define __AES__ 1
-+// CHECK_SKX_M32: #define __AVX2__ 1
-+// CHECK_SKX_M32: #define __AVX512BW__ 1
-+// CHECK_SKX_M32: #define __AVX512CD__ 1
-+// CHECK_SKX_M32: #define __AVX512DQ__ 1
-+// CHECK_SKX_M32: #define __AVX512F__ 1
-+// CHECK_SKX_M32: #define __AVX512VL__ 1
-+// CHECK_SKX_M32: #define __AVX__ 1
-+// CHECK_SKX_M32: #define __BMI2__ 1
-+// CHECK_SKX_M32: #define __BMI__ 1
-+// CHECK_SKX_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_SKX_M32: #define __CLWB__ 1
-+// CHECK_SKX_M32: #define __F16C__ 1
-+// CHECK_SKX_M32: #define __FMA__ 1
-+// CHECK_SKX_M32: #define __INVPCID__ 1
-+// CHECK_SKX_M32: #define __LZCNT__ 1
-+// CHECK_SKX_M32: #define __MMX__ 1
-+// CHECK_SKX_M32: #define __MOVBE__ 1
-+// CHECK_SKX_M32: #define __PCLMUL__ 1
-+// CHECK_SKX_M32: #define __PKU__ 1
-+// CHECK_SKX_M32: #define __POPCNT__ 1
-+// CHECK_SKX_M32: #define __PRFCHW__ 1
-+// CHECK_SKX_M32: #define __RDRND__ 1
-+// CHECK_SKX_M32: #define __RDSEED__ 1
-+// CHECK_SKX_M32-NOT: #define __SGX__ 1
-+// CHECK_SKX_M32: #define __SSE2__ 1
-+// CHECK_SKX_M32: #define __SSE3__ 1
-+// CHECK_SKX_M32: #define __SSE4_1__ 1
-+// CHECK_SKX_M32: #define __SSE4_2__ 1
-+// CHECK_SKX_M32: #define __SSE__ 1
-+// CHECK_SKX_M32: #define __SSSE3__ 1
-+// CHECK_SKX_M32: #define __XSAVEC__ 1
-+// CHECK_SKX_M32: #define __XSAVEOPT__ 1
-+// CHECK_SKX_M32: #define __XSAVES__ 1
-+// CHECK_SKX_M32: #define __XSAVE__ 1
-+// CHECK_SKX_M32: #define __corei7 1
-+// CHECK_SKX_M32: #define __corei7__ 1
-+// CHECK_SKX_M32: #define __i386 1
-+// CHECK_SKX_M32: #define __i386__ 1
-+// CHECK_SKX_M32: #define __tune_corei7__ 1
-+// CHECK_SKX_M32: #define i386 1
-+
-+// RUN: %clang -march=skylake-avx512 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SKX_M64
-+// CHECK_SKX_M64: #define __AES__ 1
-+// CHECK_SKX_M64: #define __AVX2__ 1
-+// CHECK_SKX_M64: #define __AVX512BW__ 1
-+// CHECK_SKX_M64: #define __AVX512CD__ 1
-+// CHECK_SKX_M64: #define __AVX512DQ__ 1
-+// CHECK_SKX_M64: #define __AVX512F__ 1
-+// CHECK_SKX_M64: #define __AVX512VL__ 1
-+// CHECK_SKX_M64: #define __AVX__ 1
-+// CHECK_SKX_M64: #define __BMI2__ 1
-+// CHECK_SKX_M64: #define __BMI__ 1
-+// CHECK_SKX_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_SKX_M64: #define __CLWB__ 1
-+// CHECK_SKX_M64: #define __F16C__ 1
-+// CHECK_SKX_M64: #define __FMA__ 1
-+// CHECK_SKX_M64: #define __INVPCID__ 1
-+// CHECK_SKX_M64: #define __LZCNT__ 1
-+// CHECK_SKX_M64: #define __MMX__ 1
-+// CHECK_SKX_M64: #define __MOVBE__ 1
-+// CHECK_SKX_M64: #define __PCLMUL__ 1
-+// CHECK_SKX_M64: #define __PKU__ 1
-+// CHECK_SKX_M64: #define __POPCNT__ 1
-+// CHECK_SKX_M64: #define __PRFCHW__ 1
-+// CHECK_SKX_M64: #define __RDRND__ 1
-+// CHECK_SKX_M64: #define __RDSEED__ 1
-+// CHECK_SKX_M64-NOT: #define __SGX__ 1
-+// CHECK_SKX_M64: #define __SSE2_MATH__ 1
-+// CHECK_SKX_M64: #define __SSE2__ 1
-+// CHECK_SKX_M64: #define __SSE3__ 1
-+// CHECK_SKX_M64: #define __SSE4_1__ 1
-+// CHECK_SKX_M64: #define __SSE4_2__ 1
-+// CHECK_SKX_M64: #define __SSE_MATH__ 1
-+// CHECK_SKX_M64: #define __SSE__ 1
-+// CHECK_SKX_M64: #define __SSSE3__ 1
-+// CHECK_SKX_M64: #define __XSAVEC__ 1
-+// CHECK_SKX_M64: #define __XSAVEOPT__ 1
-+// CHECK_SKX_M64: #define __XSAVES__ 1
-+// CHECK_SKX_M64: #define __XSAVE__ 1
-+// CHECK_SKX_M64: #define __amd64 1
-+// CHECK_SKX_M64: #define __amd64__ 1
-+// CHECK_SKX_M64: #define __corei7 1
-+// CHECK_SKX_M64: #define __corei7__ 1
-+// CHECK_SKX_M64: #define __tune_corei7__ 1
-+// CHECK_SKX_M64: #define __x86_64 1
-+// CHECK_SKX_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=cascadelake -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CLX_M32
-+// CHECK_CLX_M32: #define __AES__ 1
-+// CHECK_CLX_M32: #define __AVX2__ 1
-+// CHECK_CLX_M32: #define __AVX512BW__ 1
-+// CHECK_CLX_M32: #define __AVX512CD__ 1
-+// CHECK_CLX_M32: #define __AVX512DQ__ 1
-+// CHECK_CLX_M32: #define __AVX512F__ 1
-+// CHECK_CLX_M32: #define __AVX512VL__ 1
-+// CHECK_CLX_M32: #define __AVX512VNNI__ 1
-+// CHECK_CLX_M32: #define __AVX__ 1
-+// CHECK_CLX_M32: #define __BMI2__ 1
-+// CHECK_CLX_M32: #define __BMI__ 1
-+// CHECK_CLX_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_CLX_M32: #define __CLWB__ 1
-+// CHECK_CLX_M32: #define __F16C__ 1
-+// CHECK_CLX_M32: #define __FMA__ 1
-+// CHECK_CLX_M32: #define __INVPCID__ 1
-+// CHECK_CLX_M32: #define __LZCNT__ 1
-+// CHECK_CLX_M32: #define __MMX__ 1
-+// CHECK_CLX_M32: #define __MOVBE__ 1
-+// CHECK_CLX_M32: #define __PCLMUL__ 1
-+// CHECK_CLX_M32: #define __PKU__ 1
-+// CHECK_CLX_M32: #define __POPCNT__ 1
-+// CHECK_CLX_M32: #define __PRFCHW__ 1
-+// CHECK_CLX_M32: #define __RDRND__ 1
-+// CHECK_CLX_M32: #define __RDSEED__ 1
-+// CHECK_CLX_M32-NOT: #define __SGX__ 1
-+// CHECK_CLX_M32: #define __SSE2__ 1
-+// CHECK_CLX_M32: #define __SSE3__ 1
-+// CHECK_CLX_M32: #define __SSE4_1__ 1
-+// CHECK_CLX_M32: #define __SSE4_2__ 1
-+// CHECK_CLX_M32: #define __SSE__ 1
-+// CHECK_CLX_M32: #define __SSSE3__ 1
-+// CHECK_CLX_M32: #define __XSAVEC__ 1
-+// CHECK_CLX_M32: #define __XSAVEOPT__ 1
-+// CHECK_CLX_M32: #define __XSAVES__ 1
-+// CHECK_CLX_M32: #define __XSAVE__ 1
-+// CHECK_CLX_M32: #define __corei7 1
-+// CHECK_CLX_M32: #define __corei7__ 1
-+// CHECK_CLX_M32: #define __i386 1
-+// CHECK_CLX_M32: #define __i386__ 1
-+// CHECK_CLX_M32: #define __tune_corei7__ 1
-+// CHECK_CLX_M32: #define i386 1
-+
-+// RUN: %clang -march=cascadelake -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CLX_M64
-+// CHECK_CLX_M64: #define __AES__ 1
-+// CHECK_CLX_M64: #define __AVX2__ 1
-+// CHECK_CLX_M64: #define __AVX512BW__ 1
-+// CHECK_CLX_M64: #define __AVX512CD__ 1
-+// CHECK_CLX_M64: #define __AVX512DQ__ 1
-+// CHECK_CLX_M64: #define __AVX512F__ 1
-+// CHECK_CLX_M64: #define __AVX512VL__ 1
-+// CHECK_CLX_M64: #define __AVX512VNNI__ 1
-+// CHECK_CLX_M64: #define __AVX__ 1
-+// CHECK_CLX_M64: #define __BMI2__ 1
-+// CHECK_CLX_M64: #define __BMI__ 1
-+// CHECK_CLX_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_CLX_M64: #define __CLWB__ 1
-+// CHECK_CLX_M64: #define __F16C__ 1
-+// CHECK_CLX_M64: #define __FMA__ 1
-+// CHECK_CLX_M64: #define __INVPCID__ 1
-+// CHECK_CLX_M64: #define __LZCNT__ 1
-+// CHECK_CLX_M64: #define __MMX__ 1
-+// CHECK_CLX_M64: #define __MOVBE__ 1
-+// CHECK_CLX_M64: #define __PCLMUL__ 1
-+// CHECK_CLX_M64: #define __PKU__ 1
-+// CHECK_CLX_M64: #define __POPCNT__ 1
-+// CHECK_CLX_M64: #define __PRFCHW__ 1
-+// CHECK_CLX_M64: #define __RDRND__ 1
-+// CHECK_CLX_M64: #define __RDSEED__ 1
-+// CHECK_CLX_M64-NOT: #define __SGX__ 1
-+// CHECK_CLX_M64: #define __SSE2_MATH__ 1
-+// CHECK_CLX_M64: #define __SSE2__ 1
-+// CHECK_CLX_M64: #define __SSE3__ 1
-+// CHECK_CLX_M64: #define __SSE4_1__ 1
-+// CHECK_CLX_M64: #define __SSE4_2__ 1
-+// CHECK_CLX_M64: #define __SSE_MATH__ 1
-+// CHECK_CLX_M64: #define __SSE__ 1
-+// CHECK_CLX_M64: #define __SSSE3__ 1
-+// CHECK_CLX_M64: #define __XSAVEC__ 1
-+// CHECK_CLX_M64: #define __XSAVEOPT__ 1
-+// CHECK_CLX_M64: #define __XSAVES__ 1
-+// CHECK_CLX_M64: #define __XSAVE__ 1
-+// CHECK_CLX_M64: #define __amd64 1
-+// CHECK_CLX_M64: #define __amd64__ 1
-+// CHECK_CLX_M64: #define __corei7 1
-+// CHECK_CLX_M64: #define __corei7__ 1
-+// CHECK_CLX_M64: #define __tune_corei7__ 1
-+// CHECK_CLX_M64: #define __x86_64 1
-+// CHECK_CLX_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=cooperlake -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CPX_M32
-+// CHECK_CPX_M32: #define __AES__ 1
-+// CHECK_CPX_M32: #define __AVX2__ 1
-+// CHECK_CPX_M32: #define __AVX512BF16__ 1
-+// CHECK_CPX_M32: #define __AVX512BW__ 1
-+// CHECK_CPX_M32: #define __AVX512CD__ 1
-+// CHECK_CPX_M32: #define __AVX512DQ__ 1
-+// CHECK_CPX_M32: #define __AVX512F__ 1
-+// CHECK_CPX_M32: #define __AVX512VL__ 1
-+// CHECK_CPX_M32: #define __AVX512VNNI__ 1
-+// CHECK_CPX_M32: #define __AVX__ 1
-+// CHECK_CPX_M32: #define __BMI2__ 1
-+// CHECK_CPX_M32: #define __BMI__ 1
-+// CHECK_CPX_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_CPX_M32: #define __CLWB__ 1
-+// CHECK_CPX_M32: #define __F16C__ 1
-+// CHECK_CPX_M32: #define __FMA__ 1
-+// CHECK_CPX_M32: #define __INVPCID__ 1
-+// CHECK_CPX_M32: #define __LZCNT__ 1
-+// CHECK_CPX_M32: #define __MMX__ 1
-+// CHECK_CPX_M32: #define __MOVBE__ 1
-+// CHECK_CPX_M32: #define __PCLMUL__ 1
-+// CHECK_CPX_M32: #define __PKU__ 1
-+// CHECK_CPX_M32: #define __POPCNT__ 1
-+// CHECK_CPX_M32: #define __PRFCHW__ 1
-+// CHECK_CPX_M32: #define __RDRND__ 1
-+// CHECK_CPX_M32: #define __RDSEED__ 1
-+// CHECK_CPX_M32-NOT: #define __SGX__ 1
-+// CHECK_CPX_M32: #define __SSE2__ 1
-+// CHECK_CPX_M32: #define __SSE3__ 1
-+// CHECK_CPX_M32: #define __SSE4_1__ 1
-+// CHECK_CPX_M32: #define __SSE4_2__ 1
-+// CHECK_CPX_M32: #define __SSE__ 1
-+// CHECK_CPX_M32: #define __SSSE3__ 1
-+// CHECK_CPX_M32: #define __XSAVEC__ 1
-+// CHECK_CPX_M32: #define __XSAVEOPT__ 1
-+// CHECK_CPX_M32: #define __XSAVES__ 1
-+// CHECK_CPX_M32: #define __XSAVE__ 1
-+// CHECK_CPX_M32: #define __corei7 1
-+// CHECK_CPX_M32: #define __corei7__ 1
-+// CHECK_CPX_M32: #define __i386 1
-+// CHECK_CPX_M32: #define __i386__ 1
-+// CHECK_CPX_M32: #define __tune_corei7__ 1
-+// CHECK_CPX_M32: #define i386 1
-+
-+// RUN: %clang -march=cooperlake -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CPX_M64
-+// CHECK_CPX_M64: #define __AES__ 1
-+// CHECK_CPX_M64: #define __AVX2__ 1
-+// CHECK_CPX_M64: #define __AVX512BF16__ 1
-+// CHECK_CPX_M64: #define __AVX512BW__ 1
-+// CHECK_CPX_M64: #define __AVX512CD__ 1
-+// CHECK_CPX_M64: #define __AVX512DQ__ 1
-+// CHECK_CPX_M64: #define __AVX512F__ 1
-+// CHECK_CPX_M64: #define __AVX512VL__ 1
-+// CHECK_CPX_M64: #define __AVX512VNNI__ 1
-+// CHECK_CPX_M64: #define __AVX__ 1
-+// CHECK_CPX_M64: #define __BMI2__ 1
-+// CHECK_CPX_M64: #define __BMI__ 1
-+// CHECK_CPX_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_CPX_M64: #define __CLWB__ 1
-+// CHECK_CPX_M64: #define __F16C__ 1
-+// CHECK_CPX_M64: #define __FMA__ 1
-+// CHECK_CPX_M64: #define __INVPCID__ 1
-+// CHECK_CPX_M64: #define __LZCNT__ 1
-+// CHECK_CPX_M64: #define __MMX__ 1
-+// CHECK_CPX_M64: #define __MOVBE__ 1
-+// CHECK_CPX_M64: #define __PCLMUL__ 1
-+// CHECK_CPX_M64: #define __PKU__ 1
-+// CHECK_CPX_M64: #define __POPCNT__ 1
-+// CHECK_CPX_M64: #define __PRFCHW__ 1
-+// CHECK_CPX_M64: #define __RDRND__ 1
-+// CHECK_CPX_M64: #define __RDSEED__ 1
-+// CHECK_CPX_M64-NOT: #define __SGX__ 1
-+// CHECK_CPX_M64: #define __SSE2_MATH__ 1
-+// CHECK_CPX_M64: #define __SSE2__ 1
-+// CHECK_CPX_M64: #define __SSE3__ 1
-+// CHECK_CPX_M64: #define __SSE4_1__ 1
-+// CHECK_CPX_M64: #define __SSE4_2__ 1
-+// CHECK_CPX_M64: #define __SSE_MATH__ 1
-+// CHECK_CPX_M64: #define __SSE__ 1
-+// CHECK_CPX_M64: #define __SSSE3__ 1
-+// CHECK_CPX_M64: #define __XSAVEC__ 1
-+// CHECK_CPX_M64: #define __XSAVEOPT__ 1
-+// CHECK_CPX_M64: #define __XSAVES__ 1
-+// CHECK_CPX_M64: #define __XSAVE__ 1
-+// CHECK_CPX_M64: #define __amd64 1
-+// CHECK_CPX_M64: #define __amd64__ 1
-+// CHECK_CPX_M64: #define __corei7 1
-+// CHECK_CPX_M64: #define __corei7__ 1
-+// CHECK_CPX_M64: #define __tune_corei7__ 1
-+// CHECK_CPX_M64: #define __x86_64 1
-+// CHECK_CPX_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=cannonlake -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CNL_M32
-+// CHECK_CNL_M32: #define __AES__ 1
-+// CHECK_CNL_M32: #define __AVX2__ 1
-+// CHECK_CNL_M32: #define __AVX512BW__ 1
-+// CHECK_CNL_M32: #define __AVX512CD__ 1
-+// CHECK_CNL_M32: #define __AVX512DQ__ 1
-+// CHECK_CNL_M32: #define __AVX512F__ 1
-+// CHECK_CNL_M32: #define __AVX512IFMA__ 1
-+// CHECK_CNL_M32: #define __AVX512VBMI__ 1
-+// CHECK_CNL_M32: #define __AVX512VL__ 1
-+// CHECK_CNL_M32: #define __AVX__ 1
-+// CHECK_CNL_M32: #define __BMI2__ 1
-+// CHECK_CNL_M32: #define __BMI__ 1
-+// CHECK_CNL_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_CNL_M32-NOT: #define __CLWB__ 1
-+// CHECK_CNL_M32: #define __F16C__ 1
-+// CHECK_CNL_M32: #define __FMA__ 1
-+// CHECK_CNL_M32: #define __INVPCID__ 1
-+// CHECK_CNL_M32: #define __LZCNT__ 1
-+// CHECK_CNL_M32: #define __MMX__ 1
-+// CHECK_CNL_M32: #define __MOVBE__ 1
-+// CHECK_CNL_M32: #define __PCLMUL__ 1
-+// CHECK_CNL_M32: #define __PKU__ 1
-+// CHECK_CNL_M32: #define __POPCNT__ 1
-+// CHECK_CNL_M32: #define __PRFCHW__ 1
-+// CHECK_CNL_M32: #define __RDRND__ 1
-+// CHECK_CNL_M32: #define __RDSEED__ 1
-+// CHECK_CNL_M32: #define __SGX__ 1
-+// CHECK_CNL_M32: #define __SHA__ 1
-+// CHECK_CNL_M32: #define __SSE2__ 1
-+// CHECK_CNL_M32: #define __SSE3__ 1
-+// CHECK_CNL_M32: #define __SSE4_1__ 1
-+// CHECK_CNL_M32: #define __SSE4_2__ 1
-+// CHECK_CNL_M32: #define __SSE__ 1
-+// CHECK_CNL_M32: #define __SSSE3__ 1
-+// CHECK_CNL_M32: #define __XSAVEC__ 1
-+// CHECK_CNL_M32: #define __XSAVEOPT__ 1
-+// CHECK_CNL_M32: #define __XSAVES__ 1
-+// CHECK_CNL_M32: #define __XSAVE__ 1
-+// CHECK_CNL_M32: #define __corei7 1
-+// CHECK_CNL_M32: #define __corei7__ 1
-+// CHECK_CNL_M32: #define __i386 1
-+// CHECK_CNL_M32: #define __i386__ 1
-+// CHECK_CNL_M32: #define __tune_corei7__ 1
-+// CHECK_CNL_M32: #define i386 1
-+
-+// RUN: %clang -march=cannonlake -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_CNL_M64
-+// CHECK_CNL_M64: #define __AES__ 1
-+// CHECK_CNL_M64: #define __AVX2__ 1
-+// CHECK_CNL_M64: #define __AVX512BW__ 1
-+// CHECK_CNL_M64: #define __AVX512CD__ 1
-+// CHECK_CNL_M64: #define __AVX512DQ__ 1
-+// CHECK_CNL_M64: #define __AVX512F__ 1
-+// CHECK_CNL_M64: #define __AVX512IFMA__ 1
-+// CHECK_CNL_M64: #define __AVX512VBMI__ 1
-+// CHECK_CNL_M64: #define __AVX512VL__ 1
-+// CHECK_CNL_M64: #define __AVX__ 1
-+// CHECK_CNL_M64: #define __BMI2__ 1
-+// CHECK_CNL_M64: #define __BMI__ 1
-+// CHECK_CNL_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_CNL_M64-NOT: #define __CLWB__ 1
-+// CHECK_CNL_M64: #define __F16C__ 1
-+// CHECK_CNL_M64: #define __FMA__ 1
-+// CHECK_CNL_M64: #define __INVPCID__ 1
-+// CHECK_CNL_M64: #define __LZCNT__ 1
-+// CHECK_CNL_M64: #define __MMX__ 1
-+// CHECK_CNL_M64: #define __MOVBE__ 1
-+// CHECK_CNL_M64: #define __PCLMUL__ 1
-+// CHECK_CNL_M64: #define __PKU__ 1
-+// CHECK_CNL_M64: #define __POPCNT__ 1
-+// CHECK_CNL_M64: #define __PRFCHW__ 1
-+// CHECK_CNL_M64: #define __RDRND__ 1
-+// CHECK_CNL_M64: #define __RDSEED__ 1
-+// CHECK_CNL_M64: #define __SGX__ 1
-+// CHECK_CNL_M64: #define __SHA__ 1
-+// CHECK_CNL_M64: #define __SSE2__ 1
-+// CHECK_CNL_M64: #define __SSE3__ 1
-+// CHECK_CNL_M64: #define __SSE4_1__ 1
-+// CHECK_CNL_M64: #define __SSE4_2__ 1
-+// CHECK_CNL_M64: #define __SSE__ 1
-+// CHECK_CNL_M64: #define __SSSE3__ 1
-+// CHECK_CNL_M64: #define __XSAVEC__ 1
-+// CHECK_CNL_M64: #define __XSAVEOPT__ 1
-+// CHECK_CNL_M64: #define __XSAVES__ 1
-+// CHECK_CNL_M64: #define __XSAVE__ 1
-+// CHECK_CNL_M64: #define __amd64 1
-+// CHECK_CNL_M64: #define __amd64__ 1
-+// CHECK_CNL_M64: #define __corei7 1
-+// CHECK_CNL_M64: #define __corei7__ 1
-+// CHECK_CNL_M64: #define __tune_corei7__ 1
-+// CHECK_CNL_M64: #define __x86_64 1
-+// CHECK_CNL_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=icelake-client -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ICL_M32
-+// CHECK_ICL_M32: #define __AES__ 1
-+// CHECK_ICL_M32: #define __AVX2__ 1
-+// CHECK_ICL_M32: #define __AVX512BITALG__ 1
-+// CHECK_ICL_M32: #define __AVX512BW__ 1
-+// CHECK_ICL_M32: #define __AVX512CD__ 1
-+// CHECK_ICL_M32: #define __AVX512DQ__ 1
-+// CHECK_ICL_M32: #define __AVX512F__ 1
-+// CHECK_ICL_M32: #define __AVX512IFMA__ 1
-+// CHECK_ICL_M32: #define __AVX512VBMI2__ 1
-+// CHECK_ICL_M32: #define __AVX512VBMI__ 1
-+// CHECK_ICL_M32: #define __AVX512VL__ 1
-+// CHECK_ICL_M32: #define __AVX512VNNI__ 1
-+// CHECK_ICL_M32: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_ICL_M32: #define __AVX__ 1
-+// CHECK_ICL_M32: #define __BMI2__ 1
-+// CHECK_ICL_M32: #define __BMI__ 1
-+// CHECK_ICL_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_ICL_M32: #define __CLWB__ 1
-+// CHECK_ICL_M32: #define __F16C__ 1
-+// CHECK_ICL_M32: #define __FMA__ 1
-+// CHECK_ICL_M32: #define __GFNI__ 1
-+// CHECK_ICL_M32: #define __INVPCID__ 1
-+// CHECK_ICL_M32: #define __LZCNT__ 1
-+// CHECK_ICL_M32: #define __MMX__ 1
-+// CHECK_ICL_M32: #define __MOVBE__ 1
-+// CHECK_ICL_M32: #define __PCLMUL__ 1
-+// CHECK_ICL_M32: #define __PKU__ 1
-+// CHECK_ICL_M32: #define __POPCNT__ 1
-+// CHECK_ICL_M32: #define __PRFCHW__ 1
-+// CHECK_ICL_M32: #define __RDPID__ 1
-+// CHECK_ICL_M32: #define __RDRND__ 1
-+// CHECK_ICL_M32: #define __RDSEED__ 1
-+// CHECK_ICL_M32: #define __SGX__ 1
-+// CHECK_ICL_M32: #define __SHA__ 1
-+// CHECK_ICL_M32: #define __SSE2__ 1
-+// CHECK_ICL_M32: #define __SSE3__ 1
-+// CHECK_ICL_M32: #define __SSE4_1__ 1
-+// CHECK_ICL_M32: #define __SSE4_2__ 1
-+// CHECK_ICL_M32: #define __SSE__ 1
-+// CHECK_ICL_M32: #define __SSSE3__ 1
-+// CHECK_ICL_M32: #define __VAES__ 1
-+// CHECK_ICL_M32: #define __VPCLMULQDQ__ 1
-+// CHECK_ICL_M32-NOT: #define __WBNOINVD__ 1
-+// CHECK_ICL_M32: #define __XSAVEC__ 1
-+// CHECK_ICL_M32: #define __XSAVEOPT__ 1
-+// CHECK_ICL_M32: #define __XSAVES__ 1
-+// CHECK_ICL_M32: #define __XSAVE__ 1
-+// CHECK_ICL_M32: #define __corei7 1
-+// CHECK_ICL_M32: #define __corei7__ 1
-+// CHECK_ICL_M32: #define __i386 1
-+// CHECK_ICL_M32: #define __i386__ 1
-+// CHECK_ICL_M32: #define __tune_corei7__ 1
-+// CHECK_ICL_M32: #define i386 1
-+
-+// RUN: %clang -march=icelake-client -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ICL_M64
-+// CHECK_ICL_M64: #define __AES__ 1
-+// CHECK_ICL_M64: #define __AVX2__ 1
-+// CHECK_ICL_M64: #define __AVX512BITALG__ 1
-+// CHECK_ICL_M64: #define __AVX512BW__ 1
-+// CHECK_ICL_M64: #define __AVX512CD__ 1
-+// CHECK_ICL_M64: #define __AVX512DQ__ 1
-+// CHECK_ICL_M64: #define __AVX512F__ 1
-+// CHECK_ICL_M64: #define __AVX512IFMA__ 1
-+// CHECK_ICL_M64: #define __AVX512VBMI2__ 1
-+// CHECK_ICL_M64: #define __AVX512VBMI__ 1
-+// CHECK_ICL_M64: #define __AVX512VL__ 1
-+// CHECK_ICL_M64: #define __AVX512VNNI__ 1
-+// CHECK_ICL_M64: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_ICL_M64: #define __AVX__ 1
-+// CHECK_ICL_M64: #define __BMI2__ 1
-+// CHECK_ICL_M64: #define __BMI__ 1
-+// CHECK_ICL_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_ICL_M64: #define __CLWB__ 1
-+// CHECK_ICL_M64: #define __F16C__ 1
-+// CHECK_ICL_M64: #define __FMA__ 1
-+// CHECK_ICL_M64: #define __GFNI__ 1
-+// CHECK_ICL_M64: #define __INVPCID__ 1
-+// CHECK_ICL_M64: #define __LZCNT__ 1
-+// CHECK_ICL_M64: #define __MMX__ 1
-+// CHECK_ICL_M64: #define __MOVBE__ 1
-+// CHECK_ICL_M64: #define __PCLMUL__ 1
-+// CHECK_ICL_M64: #define __PKU__ 1
-+// CHECK_ICL_M64: #define __POPCNT__ 1
-+// CHECK_ICL_M64: #define __PRFCHW__ 1
-+// CHECK_ICL_M64: #define __RDPID__ 1
-+// CHECK_ICL_M64: #define __RDRND__ 1
-+// CHECK_ICL_M64: #define __RDSEED__ 1
-+// CHECK_ICL_M64: #define __SGX__ 1
-+// CHECK_ICL_M64: #define __SHA__ 1
-+// CHECK_ICL_M64: #define __SSE2__ 1
-+// CHECK_ICL_M64: #define __SSE3__ 1
-+// CHECK_ICL_M64: #define __SSE4_1__ 1
-+// CHECK_ICL_M64: #define __SSE4_2__ 1
-+// CHECK_ICL_M64: #define __SSE__ 1
-+// CHECK_ICL_M64: #define __SSSE3__ 1
-+// CHECK_ICL_M64: #define __VAES__ 1
-+// CHECK_ICL_M64: #define __VPCLMULQDQ__ 1
-+// CHECK_ICL_M64-NOT: #define __WBNOINVD__ 1
-+// CHECK_ICL_M64: #define __XSAVEC__ 1
-+// CHECK_ICL_M64: #define __XSAVEOPT__ 1
-+// CHECK_ICL_M64: #define __XSAVES__ 1
-+// CHECK_ICL_M64: #define __XSAVE__ 1
-+// CHECK_ICL_M64: #define __amd64 1
-+// CHECK_ICL_M64: #define __amd64__ 1
-+// CHECK_ICL_M64: #define __corei7 1
-+// CHECK_ICL_M64: #define __corei7__ 1
-+// CHECK_ICL_M64: #define __tune_corei7__ 1
-+// CHECK_ICL_M64: #define __x86_64 1
-+// CHECK_ICL_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=icelake-server -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ICX_M32
-+// CHECK_ICX_M32: #define __AES__ 1
-+// CHECK_ICX_M32: #define __AVX2__ 1
-+// CHECK_ICX_M32: #define __AVX512BITALG__ 1
-+// CHECK_ICX_M32: #define __AVX512BW__ 1
-+// CHECK_ICX_M32: #define __AVX512CD__ 1
-+// CHECK_ICX_M32: #define __AVX512DQ__ 1
-+// CHECK_ICX_M32: #define __AVX512F__ 1
-+// CHECK_ICX_M32: #define __AVX512IFMA__ 1
-+// CHECK_ICX_M32: #define __AVX512VBMI2__ 1
-+// CHECK_ICX_M32: #define __AVX512VBMI__ 1
-+// CHECK_ICX_M32: #define __AVX512VL__ 1
-+// CHECK_ICX_M32: #define __AVX512VNNI__ 1
-+// CHECK_ICX_M32: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_ICX_M32: #define __AVX__ 1
-+// CHECK_ICX_M32: #define __BMI2__ 1
-+// CHECK_ICX_M32: #define __BMI__ 1
-+// CHECK_ICX_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_ICX_M32: #define __CLWB__ 1
-+// CHECK_ICX_M32: #define __F16C__ 1
-+// CHECK_ICX_M32: #define __FMA__ 1
-+// CHECK_ICX_M32: #define __GFNI__ 1
-+// CHECK_ICX_M32: #define __INVPCID__ 1
-+// CHECK_ICX_M32: #define __LZCNT__ 1
-+// CHECK_ICX_M32: #define __MMX__ 1
-+// CHECK_ICX_M32: #define __MOVBE__ 1
-+// CHECK_ICX_M32: #define __PCLMUL__ 1
-+// CHECK_ICX_M32: #define __PCONFIG__ 1
-+// CHECK_ICX_M32: #define __PKU__ 1
-+// CHECK_ICX_M32: #define __POPCNT__ 1
-+// CHECK_ICX_M32: #define __PRFCHW__ 1
-+// CHECK_ICX_M32: #define __RDPID__ 1
-+// CHECK_ICX_M32: #define __RDRND__ 1
-+// CHECK_ICX_M32: #define __RDSEED__ 1
-+// CHECK_ICX_M32: #define __SGX__ 1
-+// CHECK_ICX_M32: #define __SHA__ 1
-+// CHECK_ICX_M32: #define __SSE2__ 1
-+// CHECK_ICX_M32: #define __SSE3__ 1
-+// CHECK_ICX_M32: #define __SSE4_1__ 1
-+// CHECK_ICX_M32: #define __SSE4_2__ 1
-+// CHECK_ICX_M32: #define __SSE__ 1
-+// CHECK_ICX_M32: #define __SSSE3__ 1
-+// CHECK_ICX_M32: #define __VAES__ 1
-+// CHECK_ICX_M32: #define __VPCLMULQDQ__ 1
-+// CHECK_ICX_M32: #define __WBNOINVD__ 1
-+// CHECK_ICX_M32: #define __XSAVEC__ 1
-+// CHECK_ICX_M32: #define __XSAVEOPT__ 1
-+// CHECK_ICX_M32: #define __XSAVES__ 1
-+// CHECK_ICX_M32: #define __XSAVE__ 1
-+// CHECK_ICX_M32: #define __corei7 1
-+// CHECK_ICX_M32: #define __corei7__ 1
-+// CHECK_ICX_M32: #define __i386 1
-+// CHECK_ICX_M32: #define __i386__ 1
-+// CHECK_ICX_M32: #define __tune_corei7__ 1
-+// CHECK_ICX_M32: #define i386 1
-+
-+// RUN: %clang -march=icelake-server -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ICX_M64
-+// CHECK_ICX_M64: #define __AES__ 1
-+// CHECK_ICX_M64: #define __AVX2__ 1
-+// CHECK_ICX_M64: #define __AVX512BITALG__ 1
-+// CHECK_ICX_M64: #define __AVX512BW__ 1
-+// CHECK_ICX_M64: #define __AVX512CD__ 1
-+// CHECK_ICX_M64: #define __AVX512DQ__ 1
-+// CHECK_ICX_M64: #define __AVX512F__ 1
-+// CHECK_ICX_M64: #define __AVX512IFMA__ 1
-+// CHECK_ICX_M64: #define __AVX512VBMI2__ 1
-+// CHECK_ICX_M64: #define __AVX512VBMI__ 1
-+// CHECK_ICX_M64: #define __AVX512VL__ 1
-+// CHECK_ICX_M64: #define __AVX512VNNI__ 1
-+// CHECK_ICX_M64: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_ICX_M64: #define __AVX__ 1
-+// CHECK_ICX_M64: #define __BMI2__ 1
-+// CHECK_ICX_M64: #define __BMI__ 1
-+// CHECK_ICX_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_ICX_M64: #define __CLWB__ 1
-+// CHECK_ICX_M64: #define __F16C__ 1
-+// CHECK_ICX_M64: #define __FMA__ 1
-+// CHECK_ICX_M64: #define __GFNI__ 1
-+// CHECK_ICX_M64: #define __INVPCID__ 1
-+// CHECK_ICX_M64: #define __LZCNT__ 1
-+// CHECK_ICX_M64: #define __MMX__ 1
-+// CHECK_ICX_M64: #define __MOVBE__ 1
-+// CHECK_ICX_M64: #define __PCLMUL__ 1
-+// CHECK_ICX_M64: #define __PCONFIG__ 1
-+// CHECK_ICX_M64: #define __PKU__ 1
-+// CHECK_ICX_M64: #define __POPCNT__ 1
-+// CHECK_ICX_M64: #define __PRFCHW__ 1
-+// CHECK_ICX_M64: #define __RDPID__ 1
-+// CHECK_ICX_M64: #define __RDRND__ 1
-+// CHECK_ICX_M64: #define __RDSEED__ 1
-+// CHECK_ICX_M64: #define __SGX__ 1
-+// CHECK_ICX_M64: #define __SHA__ 1
-+// CHECK_ICX_M64: #define __SSE2__ 1
-+// CHECK_ICX_M64: #define __SSE3__ 1
-+// CHECK_ICX_M64: #define __SSE4_1__ 1
-+// CHECK_ICX_M64: #define __SSE4_2__ 1
-+// CHECK_ICX_M64: #define __SSE__ 1
-+// CHECK_ICX_M64: #define __SSSE3__ 1
-+// CHECK_ICX_M64: #define __VAES__ 1
-+// CHECK_ICX_M64: #define __VPCLMULQDQ__ 1
-+// CHECK_ICX_M64: #define __WBNOINVD__ 1
-+// CHECK_ICX_M64: #define __XSAVEC__ 1
-+// CHECK_ICX_M64: #define __XSAVEOPT__ 1
-+// CHECK_ICX_M64: #define __XSAVES__ 1
-+// CHECK_ICX_M64: #define __XSAVE__ 1
-+// CHECK_ICX_M64: #define __amd64 1
-+// CHECK_ICX_M64: #define __amd64__ 1
-+// CHECK_ICX_M64: #define __corei7 1
-+// CHECK_ICX_M64: #define __corei7__ 1
-+// CHECK_ICX_M64: #define __tune_corei7__ 1
-+// CHECK_ICX_M64: #define __x86_64 1
-+// CHECK_ICX_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=tigerlake -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_TGL_M32
-+// CHECK_TGL_M32: #define __AES__ 1
-+// CHECK_TGL_M32: #define __AVX2__ 1
-+// CHECK_TGL_M32: #define __AVX512BITALG__ 1
-+// CHECK_TGL_M32: #define __AVX512BW__ 1
-+// CHECK_TGL_M32: #define __AVX512CD__ 1
-+// CHECK_TGL_M32: #define __AVX512DQ__ 1
-+// CHECK_TGL_M32: #define __AVX512F__ 1
-+// CHECK_TGL_M32: #define __AVX512IFMA__ 1
-+// CHECK_TGL_M32: #define __AVX512VBMI2__ 1
-+// CHECK_TGL_M32: #define __AVX512VBMI__ 1
-+// CHECK_TGL_M32: #define __AVX512VL__ 1
-+// CHECK_TGL_M32: #define __AVX512VNNI__ 1
-+// CHECK_TGL_M32: #define __AVX512VP2INTERSECT__ 1
-+// CHECK_TGL_M32: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_TGL_M32: #define __AVX__ 1
-+// CHECK_TGL_M32: #define __BMI2__ 1
-+// CHECK_TGL_M32: #define __BMI__ 1
-+// CHECK_TGL_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_TGL_M32: #define __CLWB__ 1
-+// CHECK_TGL_M32: #define __F16C__ 1
-+// CHECK_TGL_M32: #define __FMA__ 1
-+// CHECK_TGL_M32: #define __GFNI__ 1
-+// CHECK_TGL_M32: #define __INVPCID__ 1
-+// CHECK_TGL_M32: #define __LZCNT__ 1
-+// CHECK_TGL_M32: #define __MMX__ 1
-+// CHECK_TGL_M32: #define __MOVBE__ 1
-+// CHECK_TGL_M32: #define __MOVDIR64B__ 1
-+// CHECK_TGL_M32: #define __MOVDIRI__ 1
-+// CHECK_TGL_M32: #define __PCLMUL__ 1
-+// CHECK_TGL_M32-NOT: #define __PCONFIG__ 1
-+// CHECK_TGL_M32: #define __PKU__ 1
-+// CHECK_TGL_M32: #define __POPCNT__ 1
-+// CHECK_TGL_M32: #define __PRFCHW__ 1
-+// CHECK_TGL_M32: #define __RDPID__ 1
-+// CHECK_TGL_M32: #define __RDRND__ 1
-+// CHECK_TGL_M32: #define __RDSEED__ 1
-+// CHECK_TGL_M32: #define __SGX__ 1
-+// CHECK_TGL_M32: #define __SHA__ 1
-+// CHECK_TGL_M32: #define __SHSTK__ 1
-+// CHECK_TGL_M32: #define __SSE2__ 1
-+// CHECK_TGL_M32: #define __SSE3__ 1
-+// CHECK_TGL_M32: #define __SSE4_1__ 1
-+// CHECK_TGL_M32: #define __SSE4_2__ 1
-+// CHECK_TGL_M32: #define __SSE__ 1
-+// CHECK_TGL_M32: #define __SSSE3__ 1
-+// CHECK_TGL_M32: #define __VAES__ 1
-+// CHECK_TGL_M32: #define __VPCLMULQDQ__ 1
-+// CHECK_TGL_M32-NOT: #define __WBNOINVD__ 1
-+// CHECK_TGL_M32: #define __XSAVEC__ 1
-+// CHECK_TGL_M32: #define __XSAVEOPT__ 1
-+// CHECK_TGL_M32: #define __XSAVES__ 1
-+// CHECK_TGL_M32: #define __XSAVE__ 1
-+// CHECK_TGL_M32: #define __corei7 1
-+// CHECK_TGL_M32: #define __corei7__ 1
-+// CHECK_TGL_M32: #define __i386 1
-+// CHECK_TGL_M32: #define __i386__ 1
-+// CHECK_TGL_M32: #define __tune_corei7__ 1
-+// CHECK_TGL_M32: #define i386 1
-+
-+// RUN: %clang -march=tigerlake -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_TGL_M64
-+// CHECK_TGL_M64: #define __AES__ 1
-+// CHECK_TGL_M64: #define __AVX2__ 1
-+// CHECK_TGL_M64: #define __AVX512BITALG__ 1
-+// CHECK_TGL_M64: #define __AVX512BW__ 1
-+// CHECK_TGL_M64: #define __AVX512CD__ 1
-+// CHECK_TGL_M64: #define __AVX512DQ__ 1
-+// CHECK_TGL_M64: #define __AVX512F__ 1
-+// CHECK_TGL_M64: #define __AVX512IFMA__ 1
-+// CHECK_TGL_M64: #define __AVX512VBMI2__ 1
-+// CHECK_TGL_M64: #define __AVX512VBMI__ 1
-+// CHECK_TGL_M64: #define __AVX512VL__ 1
-+// CHECK_TGL_M64: #define __AVX512VNNI__ 1
-+// CHECK_TGL_M64: #define __AVX512VP2INTERSECT__ 1
-+// CHECK_TGL_M64: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_TGL_M64: #define __AVX__ 1
-+// CHECK_TGL_M64: #define __BMI2__ 1
-+// CHECK_TGL_M64: #define __BMI__ 1
-+// CHECK_TGL_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_TGL_M64: #define __CLWB__ 1
-+// CHECK_TGL_M64: #define __F16C__ 1
-+// CHECK_TGL_M64: #define __FMA__ 1
-+// CHECK_TGL_M64: #define __GFNI__ 1
-+// CHECK_TGL_M64: #define __INVPCID__ 1
-+// CHECK_TGL_M64: #define __LZCNT__ 1
-+// CHECK_TGL_M64: #define __MMX__ 1
-+// CHECK_TGL_M64: #define __MOVBE__ 1
-+// CHECK_TGL_M64: #define __MOVDIR64B__ 1
-+// CHECK_TGL_M64: #define __MOVDIRI__ 1
-+// CHECK_TGL_M64: #define __PCLMUL__ 1
-+// CHECK_TGL_M64-NOT: #define __PCONFIG__ 1
-+// CHECK_TGL_M64: #define __PKU__ 1
-+// CHECK_TGL_M64: #define __POPCNT__ 1
-+// CHECK_TGL_M64: #define __PRFCHW__ 1
-+// CHECK_TGL_M64: #define __RDPID__ 1
-+// CHECK_TGL_M64: #define __RDRND__ 1
-+// CHECK_TGL_M64: #define __RDSEED__ 1
-+// CHECK_TGL_M64: #define __SGX__ 1
-+// CHECK_TGL_M64: #define __SHA__ 1
-+// CHECK_TGL_M64: #define __SHSTK__ 1
-+// CHECK_TGL_M64: #define __SSE2__ 1
-+// CHECK_TGL_M64: #define __SSE3__ 1
-+// CHECK_TGL_M64: #define __SSE4_1__ 1
-+// CHECK_TGL_M64: #define __SSE4_2__ 1
-+// CHECK_TGL_M64: #define __SSE__ 1
-+// CHECK_TGL_M64: #define __SSSE3__ 1
-+// CHECK_TGL_M64: #define __VAES__ 1
-+// CHECK_TGL_M64: #define __VPCLMULQDQ__ 1
-+// CHECK_TGL_M64-NOT: #define __WBNOINVD__ 1
-+// CHECK_TGL_M64: #define __XSAVEC__ 1
-+// CHECK_TGL_M64: #define __XSAVEOPT__ 1
-+// CHECK_TGL_M64: #define __XSAVES__ 1
-+// CHECK_TGL_M64: #define __XSAVE__ 1
-+// CHECK_TGL_M64: #define __amd64 1
-+// CHECK_TGL_M64: #define __amd64__ 1
-+// CHECK_TGL_M64: #define __corei7 1
-+// CHECK_TGL_M64: #define __corei7__ 1
-+// CHECK_TGL_M64: #define __tune_corei7__ 1
-+// CHECK_TGL_M64: #define __x86_64 1
-+// CHECK_TGL_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=sapphirerapids -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPR_M32
-+// CHECK_SPR_M32: #define __AES__ 1
-+// CHECK_SPR_M32: #define __AMXBF16__ 1
-+// CHECK_SPR_M32: #define __AMXINT8__ 1
-+// CHECK_SPR_M32: #define __AMXTILE__ 1
-+// CHECK_SPR_M32: #define __AVX2__ 1
-+// CHECK_SPR_M32: #define __AVX512BF16__ 1
-+// CHECK_SPR_M32: #define __AVX512BITALG__ 1
-+// CHECK_SPR_M32: #define __AVX512BW__ 1
-+// CHECK_SPR_M32: #define __AVX512CD__ 1
-+// CHECK_SPR_M32: #define __AVX512DQ__ 1
-+// CHECK_SPR_M32: #define __AVX512F__ 1
-+// CHECK_SPR_M32: #define __AVX512IFMA__ 1
-+// CHECK_SPR_M32: #define __AVX512VBMI2__ 1
-+// CHECK_SPR_M32: #define __AVX512VBMI__ 1
-+// CHECK_SPR_M32: #define __AVX512VL__ 1
-+// CHECK_SPR_M32: #define __AVX512VNNI__ 1
-+// CHECK_SPR_M32: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_SPR_M32: #define __AVXVNNI__ 1
-+// CHECK_SPR_M32: #define __AVX__ 1
-+// CHECK_SPR_M32: #define __BMI2__ 1
-+// CHECK_SPR_M32: #define __BMI__ 1
-+// CHECK_SPR_M32: #define __CLDEMOTE__ 1
-+// CHECK_SPR_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_SPR_M32: #define __CLWB__ 1
-+// CHECK_SPR_M32: #define __ENQCMD__ 1
-+// CHECK_SPR_M32: #define __F16C__ 1
-+// CHECK_SPR_M32: #define __FMA__ 1
-+// CHECK_SPR_M32: #define __GFNI__ 1
-+// CHECK_SPR_M32: #define __INVPCID__ 1
-+// CHECK_SPR_M32: #define __LZCNT__ 1
-+// CHECK_SPR_M32: #define __MMX__ 1
-+// CHECK_SPR_M32: #define __MOVBE__ 1
-+// CHECK_SPR_M32: #define __PCLMUL__ 1
-+// CHECK_SPR_M32: #define __PCONFIG__ 1
-+// CHECK_SPR_M32: #define __PKU__ 1
-+// CHECK_SPR_M32: #define __POPCNT__ 1
-+// CHECK_SPR_M32: #define __PRFCHW__ 1
-+// CHECK_SPR_M32: #define __PTWRITE__ 1
-+// CHECK_SPR_M32: #define __RDPID__ 1
-+// CHECK_SPR_M32: #define __RDRND__ 1
-+// CHECK_SPR_M32: #define __RDSEED__ 1
-+// CHECK_SPR_M32: #define __SERIALIZE__ 1
-+// CHECK_SPR_M32: #define __SGX__ 1
-+// CHECK_SPR_M32: #define __SHA__ 1
-+// CHECK_SPR_M32: #define __SHSTK__ 1
-+// CHECK_SPR_M32: #define __SSE2__ 1
-+// CHECK_SPR_M32: #define __SSE3__ 1
-+// CHECK_SPR_M32: #define __SSE4_1__ 1
-+// CHECK_SPR_M32: #define __SSE4_2__ 1
-+// CHECK_SPR_M32: #define __SSE__ 1
-+// CHECK_SPR_M32: #define __SSSE3__ 1
-+// CHECK_SPR_M32: #define __TSXLDTRK__ 1
-+// CHECK_SPR_M32: #define __UINTR__ 1
-+// CHECK_SPR_M32: #define __VAES__ 1
-+// CHECK_SPR_M32: #define __VPCLMULQDQ__ 1
-+// CHECK_SPR_M32: #define __WAITPKG__ 1
-+// CHECK_SPR_M32: #define __WBNOINVD__ 1
-+// CHECK_SPR_M32: #define __XSAVEC__ 1
-+// CHECK_SPR_M32: #define __XSAVEOPT__ 1
-+// CHECK_SPR_M32: #define __XSAVES__ 1
-+// CHECK_SPR_M32: #define __XSAVE__ 1
-+// CHECK_SPR_M32: #define __corei7 1
-+// CHECK_SPR_M32: #define __corei7__ 1
-+// CHECK_SPR_M32: #define __i386 1
-+// CHECK_SPR_M32: #define __i386__ 1
-+// CHECK_SPR_M32: #define __tune_corei7__ 1
-+// CHECK_SPR_M32: #define i386 1
-+
-+// RUN: %clang -march=sapphirerapids -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPR_M64
-+// CHECK_SPR_M64: #define __AES__ 1
-+// CHECK_SPR_M64: #define __AMXBF16__ 1
-+// CHECK_SPR_M64: #define __AMXINT8__ 1
-+// CHECK_SPR_M64: #define __AMXTILE__ 1
-+// CHECK_SPR_M64: #define __AVX2__ 1
-+// CHECK_SPR_M64: #define __AVX512BF16__ 1
-+// CHECK_SPR_M64: #define __AVX512BITALG__ 1
-+// CHECK_SPR_M64: #define __AVX512BW__ 1
-+// CHECK_SPR_M64: #define __AVX512CD__ 1
-+// CHECK_SPR_M64: #define __AVX512DQ__ 1
-+// CHECK_SPR_M64: #define __AVX512F__ 1
-+// CHECK_SPR_M64: #define __AVX512IFMA__ 1
-+// CHECK_SPR_M64: #define __AVX512VBMI2__ 1
-+// CHECK_SPR_M64: #define __AVX512VBMI__ 1
-+// CHECK_SPR_M64: #define __AVX512VL__ 1
-+// CHECK_SPR_M64: #define __AVX512VNNI__ 1
-+// CHECK_SPR_M64: #define __AVX512VPOPCNTDQ__ 1
-+// CHECK_SPR_M64: #define __AVXVNNI__ 1
-+// CHECK_SPR_M64: #define __AVX__ 1
-+// CHECK_SPR_M64: #define __BMI2__ 1
-+// CHECK_SPR_M64: #define __BMI__ 1
-+// CHECK_SPR_M64: #define __CLDEMOTE__ 1
-+// CHECK_SPR_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_SPR_M64: #define __CLWB__ 1
-+// CHECK_SPR_M64: #define __ENQCMD__ 1
-+// CHECK_SPR_M64: #define __F16C__ 1
-+// CHECK_SPR_M64: #define __FMA__ 1
-+// CHECK_SPR_M64: #define __GFNI__ 1
-+// CHECK_SPR_M64: #define __INVPCID__ 1
-+// CHECK_SPR_M64: #define __LZCNT__ 1
-+// CHECK_SPR_M64: #define __MMX__ 1
-+// CHECK_SPR_M64: #define __MOVBE__ 1
-+// CHECK_SPR_M64: #define __PCLMUL__ 1
-+// CHECK_SPR_M64: #define __PCONFIG__ 1
-+// CHECK_SPR_M64: #define __PKU__ 1
-+// CHECK_SPR_M64: #define __POPCNT__ 1
-+// CHECK_SPR_M64: #define __PRFCHW__ 1
-+// CHECK_SPR_M64: #define __PTWRITE__ 1
-+// CHECK_SPR_M64: #define __RDPID__ 1
-+// CHECK_SPR_M64: #define __RDRND__ 1
-+// CHECK_SPR_M64: #define __RDSEED__ 1
-+// CHECK_SPR_M64: #define __SERIALIZE__ 1
-+// CHECK_SPR_M64: #define __SGX__ 1
-+// CHECK_SPR_M64: #define __SHA__ 1
-+// CHECK_SPR_M64: #define __SHSTK__ 1
-+// CHECK_SPR_M64: #define __SSE2__ 1
-+// CHECK_SPR_M64: #define __SSE3__ 1
-+// CHECK_SPR_M64: #define __SSE4_1__ 1
-+// CHECK_SPR_M64: #define __SSE4_2__ 1
-+// CHECK_SPR_M64: #define __SSE__ 1
-+// CHECK_SPR_M64: #define __SSSE3__ 1
-+// CHECK_SPR_M64: #define __TSXLDTRK__ 1
-+// CHECK_SPR_M64: #define __UINTR__ 1
-+// CHECK_SPR_M64: #define __VAES__ 1
-+// CHECK_SPR_M64: #define __VPCLMULQDQ__ 1
-+// CHECK_SPR_M64: #define __WAITPKG__ 1
-+// CHECK_SPR_M64: #define __WBNOINVD__ 1
-+// CHECK_SPR_M64: #define __XSAVEC__ 1
-+// CHECK_SPR_M64: #define __XSAVEOPT__ 1
-+// CHECK_SPR_M64: #define __XSAVES__ 1
-+// CHECK_SPR_M64: #define __XSAVE__ 1
-+// CHECK_SPR_M64: #define __amd64 1
-+// CHECK_SPR_M64: #define __amd64__ 1
-+// CHECK_SPR_M64: #define __corei7 1
-+// CHECK_SPR_M64: #define __corei7__ 1
-+// CHECK_SPR_M64: #define __tune_corei7__ 1
-+// CHECK_SPR_M64: #define __x86_64 1
-+// CHECK_SPR_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=alderlake -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ADL_M32
-+// CHECK_ADL_M32: #define __ADX__ 1
-+// CHECK_ADL_M32: #define __AES__ 1
-+// CHECK_ADL_M32: #define __AVX2__ 1
-+// CHECK_ADL_M32-NOT: AVX512
-+// CHECK_ADL_M32: #define __AVXVNNI__ 1
-+// CHECK_ADL_M32: #define __AVX__ 1
-+// CHECK_ADL_M32: #define __BMI2__ 1
-+// CHECK_ADL_M32: #define __BMI__ 1
-+// CHECK_ADL_M32: #define __CLDEMOTE__ 1
-+// CHECK_ADL_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_ADL_M32: #define __F16C__ 1
-+// CHECK_ADL_M32: #define __FMA__ 1
-+// CHECK_ADL_M32: #define __HRESET__ 1
-+// CHECK_ADL_M32: #define __INVPCID__ 1
-+// CHECK_ADL_M32: #define __LZCNT__ 1
-+// CHECK_ADL_M32: #define __MMX__ 1
-+// CHECK_ADL_M32: #define __MOVBE__ 1
-+// CHECK_ADL_M32: #define __PCLMUL__ 1
-+// CHECK_ADL_M32: #define __POPCNT__ 1
-+// CHECK_ADL_M32: #define __PRFCHW__ 1
-+// CHECK_ADL_M32: #define __PTWRITE__ 1
-+// CHECK_ADL_M32: #define __RDRND__ 1
-+// CHECK_ADL_M32: #define __RDSEED__ 1
-+// CHECK_ADL_M32: #define __SERIALIZE__ 1
-+// CHECK_ADL_M32: #define __SGX__ 1
-+// CHECK_ADL_M32: #define __SSE2__ 1
-+// CHECK_ADL_M32: #define __SSE3__ 1
-+// CHECK_ADL_M32: #define __SSE4_1__ 1
-+// CHECK_ADL_M32: #define __SSE4_2__ 1
-+// CHECK_ADL_M32: #define __SSE__ 1
-+// CHECK_ADL_M32: #define __SSSE3__ 1
-+// CHECK_ADL_M32: #define __WAITPKG__ 1
-+// CHECK_ADL_M32: #define __XSAVEC__ 1
-+// CHECK_ADL_M32: #define __XSAVEOPT__ 1
-+// CHECK_ADL_M32: #define __XSAVES__ 1
-+// CHECK_ADL_M32: #define __XSAVE__ 1
-+// CHECK_ADL_M32: #define i386 1
-+
-+// RUN: %clang -march=alderlake -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ADL_M64
-+// CHECK_ADL_M64: #define __ADX__ 1
-+// CHECK_ADL_M64: #define __AES__ 1
-+// CHECK_ADL_M64: #define __AVX2__ 1
-+// CHECK_ADL_M64-NOT: AVX512
-+// CHECK_ADL_M64: #define __AVXVNNI__ 1
-+// CHECK_ADL_M64: #define __AVX__ 1
-+// CHECK_ADL_M64: #define __BMI2__ 1
-+// CHECK_ADL_M64: #define __BMI__ 1
-+// CHECK_ADL_M64: #define __CLDEMOTE__ 1
-+// CHECK_ADL_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_ADL_M64: #define __F16C__ 1
-+// CHECK_ADL_M64: #define __FMA__ 1
-+// CHECK_ADL_M64: #define __HRESET__ 1
-+// CHECK_ADL_M64: #define __INVPCID__ 1
-+// CHECK_ADL_M64: #define __LZCNT__ 1
-+// CHECK_ADL_M64: #define __MMX__ 1
-+// CHECK_ADL_M64: #define __MOVBE__ 1
-+// CHECK_ADL_M64: #define __PCLMUL__ 1
-+// CHECK_ADL_M64: #define __POPCNT__ 1
-+// CHECK_ADL_M64: #define __PRFCHW__ 1
-+// CHECK_ADL_M64: #define __PTWRITE__ 1
-+// CHECK_ADL_M64: #define __RDRND__ 1
-+// CHECK_ADL_M64: #define __RDSEED__ 1
-+// CHECK_ADL_M64: #define __SERIALIZE__ 1
-+// CHECK_ADL_M64: #define __SGX__ 1
-+// CHECK_ADL_M64: #define __SSE2_MATH__ 1
-+// CHECK_ADL_M64: #define __SSE2__ 1
-+// CHECK_ADL_M64: #define __SSE3__ 1
-+// CHECK_ADL_M64: #define __SSE4_1__ 1
-+// CHECK_ADL_M64: #define __SSE4_2__ 1
-+// CHECK_ADL_M64: #define __SSE_MATH__ 1
-+// CHECK_ADL_M64: #define __SSE__ 1
-+// CHECK_ADL_M64: #define __SSSE3__ 1
-+// CHECK_ADL_M64: #define __WAITPKG__ 1
-+// CHECK_ADL_M64: #define __XSAVEC__ 1
-+// CHECK_ADL_M64: #define __XSAVEOPT__ 1
-+// CHECK_ADL_M64: #define __XSAVES__ 1
-+// CHECK_ADL_M64: #define __XSAVE__ 1
-+// CHECK_ADL_M64: #define __amd64 1
-+// CHECK_ADL_M64: #define __amd64__ 1
-+// CHECK_ADL_M64: #define __x86_64 1
-+// CHECK_ADL_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=atom -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATOM_M32
-+// CHECK_ATOM_M32: #define __MMX__ 1
-+// CHECK_ATOM_M32: #define __MOVBE__ 1
-+// CHECK_ATOM_M32: #define __SSE2__ 1
-+// CHECK_ATOM_M32: #define __SSE3__ 1
-+// CHECK_ATOM_M32: #define __SSE__ 1
-+// CHECK_ATOM_M32: #define __SSSE3__ 1
-+// CHECK_ATOM_M32: #define __atom 1
-+// CHECK_ATOM_M32: #define __atom__ 1
-+// CHECK_ATOM_M32: #define __i386 1
-+// CHECK_ATOM_M32: #define __i386__ 1
-+// CHECK_ATOM_M32: #define __tune_atom__ 1
-+// CHECK_ATOM_M32: #define i386 1
-+
-+// RUN: %clang -march=atom -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATOM_M64
-+// CHECK_ATOM_M64: #define __MMX__ 1
-+// CHECK_ATOM_M64: #define __MOVBE__ 1
-+// CHECK_ATOM_M64: #define __SSE2_MATH__ 1
-+// CHECK_ATOM_M64: #define __SSE2__ 1
-+// CHECK_ATOM_M64: #define __SSE3__ 1
-+// CHECK_ATOM_M64: #define __SSE_MATH__ 1
-+// CHECK_ATOM_M64: #define __SSE__ 1
-+// CHECK_ATOM_M64: #define __SSSE3__ 1
-+// CHECK_ATOM_M64: #define __amd64 1
-+// CHECK_ATOM_M64: #define __amd64__ 1
-+// CHECK_ATOM_M64: #define __atom 1
-+// CHECK_ATOM_M64: #define __atom__ 1
-+// CHECK_ATOM_M64: #define __tune_atom__ 1
-+// CHECK_ATOM_M64: #define __x86_64 1
-+// CHECK_ATOM_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=goldmont -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck %s -check-prefix=CHECK_GLM_M32
-+// CHECK_GLM_M32: #define __AES__ 1
-+// CHECK_GLM_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_GLM_M32: #define __FSGSBASE__ 1
-+// CHECK_GLM_M32: #define __FXSR__ 1
-+// CHECK_GLM_M32: #define __MMX__ 1
-+// CHECK_GLM_M32: #define __MOVBE__ 1
-+// CHECK_GLM_M32: #define __PCLMUL__ 1
-+// CHECK_GLM_M32: #define __POPCNT__ 1
-+// CHECK_GLM_M32: #define __PRFCHW__ 1
-+// CHECK_GLM_M32: #define __RDRND__ 1
-+// CHECK_GLM_M32: #define __RDSEED__ 1
-+// CHECK_GLM_M32: #define __SHA__ 1
-+// CHECK_GLM_M32: #define __SSE2__ 1
-+// CHECK_GLM_M32: #define __SSE3__ 1
-+// CHECK_GLM_M32: #define __SSE4_1__ 1
-+// CHECK_GLM_M32: #define __SSE4_2__ 1
-+// CHECK_GLM_M32: #define __SSE_MATH__ 1
-+// CHECK_GLM_M32: #define __SSE__ 1
-+// CHECK_GLM_M32: #define __SSSE3__ 1
-+// CHECK_GLM_M32: #define __XSAVEC__ 1
-+// CHECK_GLM_M32: #define __XSAVEOPT__ 1
-+// CHECK_GLM_M32: #define __XSAVES__ 1
-+// CHECK_GLM_M32: #define __XSAVE__ 1
-+// CHECK_GLM_M32: #define __goldmont 1
-+// CHECK_GLM_M32: #define __goldmont__ 1
-+// CHECK_GLM_M32: #define __i386 1
-+// CHECK_GLM_M32: #define __i386__ 1
-+// CHECK_GLM_M32: #define __tune_goldmont__ 1
-+// CHECK_GLM_M32: #define i386 1
-+
-+// RUN: %clang -march=goldmont -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck %s -check-prefix=CHECK_GLM_M64
-+// CHECK_GLM_M64: #define __AES__ 1
-+// CHECK_GLM_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_GLM_M64: #define __FSGSBASE__ 1
-+// CHECK_GLM_M64: #define __FXSR__ 1
-+// CHECK_GLM_M64: #define __MMX__ 1
-+// CHECK_GLM_M64: #define __MOVBE__ 1
-+// CHECK_GLM_M64: #define __PCLMUL__ 1
-+// CHECK_GLM_M64: #define __POPCNT__ 1
-+// CHECK_GLM_M64: #define __PRFCHW__ 1
-+// CHECK_GLM_M64: #define __RDRND__ 1
-+// CHECK_GLM_M64: #define __RDSEED__ 1
-+// CHECK_GLM_M64: #define __SHA__ 1
-+// CHECK_GLM_M64: #define __SSE2__ 1
-+// CHECK_GLM_M64: #define __SSE3__ 1
-+// CHECK_GLM_M64: #define __SSE4_1__ 1
-+// CHECK_GLM_M64: #define __SSE4_2__ 1
-+// CHECK_GLM_M64: #define __SSE__ 1
-+// CHECK_GLM_M64: #define __SSSE3__ 1
-+// CHECK_GLM_M64: #define __XSAVEC__ 1
-+// CHECK_GLM_M64: #define __XSAVEOPT__ 1
-+// CHECK_GLM_M64: #define __XSAVES__ 1
-+// CHECK_GLM_M64: #define __XSAVE__ 1
-+// CHECK_GLM_M64: #define __goldmont 1
-+// CHECK_GLM_M64: #define __goldmont__ 1
-+// CHECK_GLM_M64: #define __tune_goldmont__ 1
-+// CHECK_GLM_M64: #define __x86_64 1
-+// CHECK_GLM_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=goldmont-plus -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck %s -check-prefix=CHECK_GLMP_M32
-+// CHECK_GLMP_M32: #define __AES__ 1
-+// CHECK_GLMP_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_GLMP_M32: #define __FSGSBASE__ 1
-+// CHECK_GLMP_M32: #define __FXSR__ 1
-+// CHECK_GLMP_M32: #define __MMX__ 1
-+// CHECK_GLMP_M32: #define __MOVBE__ 1
-+// CHECK_GLMP_M32: #define __PCLMUL__ 1
-+// CHECK_GLMP_M32: #define __POPCNT__ 1
-+// CHECK_GLMP_M32: #define __PRFCHW__ 1
-+// CHECK_GLMP_M32: #define __PTWRITE__ 1
-+// CHECK_GLMP_M32: #define __RDPID__ 1
-+// CHECK_GLMP_M32: #define __RDRND__ 1
-+// CHECK_GLMP_M32: #define __RDSEED__ 1
-+// CHECK_GLMP_M32: #define __SGX__ 1
-+// CHECK_GLMP_M32: #define __SHA__ 1
-+// CHECK_GLMP_M32: #define __SSE2__ 1
-+// CHECK_GLMP_M32: #define __SSE3__ 1
-+// CHECK_GLMP_M32: #define __SSE4_1__ 1
-+// CHECK_GLMP_M32: #define __SSE4_2__ 1
-+// CHECK_GLMP_M32: #define __SSE_MATH__ 1
-+// CHECK_GLMP_M32: #define __SSE__ 1
-+// CHECK_GLMP_M32: #define __SSSE3__ 1
-+// CHECK_GLMP_M32: #define __XSAVEC__ 1
-+// CHECK_GLMP_M32: #define __XSAVEOPT__ 1
-+// CHECK_GLMP_M32: #define __XSAVES__ 1
-+// CHECK_GLMP_M32: #define __XSAVE__ 1
-+// CHECK_GLMP_M32: #define __goldmont_plus 1
-+// CHECK_GLMP_M32: #define __goldmont_plus__ 1
-+// CHECK_GLMP_M32: #define __i386 1
-+// CHECK_GLMP_M32: #define __i386__ 1
-+// CHECK_GLMP_M32: #define __tune_goldmont_plus__ 1
-+// CHECK_GLMP_M32: #define i386 1
-+
-+// RUN: %clang -march=goldmont-plus -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck %s -check-prefix=CHECK_GLMP_M64
-+// CHECK_GLMP_M64: #define __AES__ 1
-+// CHECK_GLMP_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_GLMP_M64: #define __FSGSBASE__ 1
-+// CHECK_GLMP_M64: #define __FXSR__ 1
-+// CHECK_GLMP_M64: #define __MMX__ 1
-+// CHECK_GLMP_M64: #define __MOVBE__ 1
-+// CHECK_GLMP_M64: #define __PCLMUL__ 1
-+// CHECK_GLMP_M64: #define __POPCNT__ 1
-+// CHECK_GLMP_M64: #define __PRFCHW__ 1
-+// CHECK_GLMP_M64: #define __PTWRITE__ 1
-+// CHECK_GLMP_M64: #define __RDPID__ 1
-+// CHECK_GLMP_M64: #define __RDRND__ 1
-+// CHECK_GLMP_M64: #define __RDSEED__ 1
-+// CHECK_GLMP_M64: #define __SGX__ 1
-+// CHECK_GLMP_M64: #define __SHA__ 1
-+// CHECK_GLMP_M64: #define __SSE2__ 1
-+// CHECK_GLMP_M64: #define __SSE3__ 1
-+// CHECK_GLMP_M64: #define __SSE4_1__ 1
-+// CHECK_GLMP_M64: #define __SSE4_2__ 1
-+// CHECK_GLMP_M64: #define __SSE__ 1
-+// CHECK_GLMP_M64: #define __SSSE3__ 1
-+// CHECK_GLMP_M64: #define __XSAVEC__ 1
-+// CHECK_GLMP_M64: #define __XSAVEOPT__ 1
-+// CHECK_GLMP_M64: #define __XSAVES__ 1
-+// CHECK_GLMP_M64: #define __XSAVE__ 1
-+// CHECK_GLMP_M64: #define __goldmont_plus 1
-+// CHECK_GLMP_M64: #define __goldmont_plus__ 1
-+// CHECK_GLMP_M64: #define __tune_goldmont_plus__ 1
-+// CHECK_GLMP_M64: #define __x86_64 1
-+// CHECK_GLMP_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=tremont -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck %s -check-prefix=CHECK_TRM_M32
-+// CHECK_TRM_M32: #define __AES__ 1
-+// CHECK_TRM_M32-NOT: #define __CLDEMOTE__ 1
-+// CHECK_TRM_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_TRM_M32: #define __CLWB__ 1
-+// CHECK_TRM_M32: #define __FSGSBASE__ 1
-+// CHECK_TRM_M32: #define __FXSR__ 1
-+// CHECK_TRM_M32: #define __GFNI__ 1
-+// CHECK_TRM_M32: #define __MMX__ 1
-+// CHECK_TRM_M32: #define __MOVBE__ 1
-+// CHECK_TRM_M32-NOT: #define __MOVDIR64B__ 1
-+// CHECK_TRM_M32-NOT: #define __MOVDIRI__ 1
-+// CHECK_TRM_M32: #define __PCLMUL__ 1
-+// CHECK_TRM_M32: #define __POPCNT__ 1
-+// CHECK_TRM_M32: #define __PRFCHW__ 1
-+// CHECK_TRM_M32: #define __PTWRITE__ 1
-+// CHECK_TRM_M32: #define __RDPID__ 1
-+// CHECK_TRM_M32: #define __RDRND__ 1
-+// CHECK_TRM_M32: #define __RDSEED__ 1
-+// CHECK_TRM_M32: #define __SGX__ 1
-+// CHECK_TRM_M32: #define __SHA__ 1
-+// CHECK_TRM_M32: #define __SSE2__ 1
-+// CHECK_TRM_M32: #define __SSE3__ 1
-+// CHECK_TRM_M32: #define __SSE4_1__ 1
-+// CHECK_TRM_M32: #define __SSE4_2__ 1
-+// CHECK_TRM_M32: #define __SSE_MATH__ 1
-+// CHECK_TRM_M32: #define __SSE__ 1
-+// CHECK_TRM_M32: #define __SSSE3__ 1
-+// CHECK_TRM_M32-NOT: #define __WAITPKG__ 1
-+// CHECK_TRM_M32: #define __XSAVEC__ 1
-+// CHECK_TRM_M32: #define __XSAVEOPT__ 1
-+// CHECK_TRM_M32: #define __XSAVES__ 1
-+// CHECK_TRM_M32: #define __XSAVE__ 1
-+// CHECK_TRM_M32: #define __i386 1
-+// CHECK_TRM_M32: #define __i386__ 1
-+// CHECK_TRM_M32: #define __tremont 1
-+// CHECK_TRM_M32: #define __tremont__ 1
-+// CHECK_TRM_M32: #define __tune_tremont__ 1
-+// CHECK_TRM_M32: #define i386 1
-+
-+// RUN: %clang -march=tremont -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck %s -check-prefix=CHECK_TRM_M64
-+// CHECK_TRM_M64: #define __AES__ 1
-+// CHECK_TRM_M64-NOT: #define __CLDEMOTE__ 1
-+// CHECK_TRM_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_TRM_M64: #define __CLWB__ 1
-+// CHECK_TRM_M64: #define __FSGSBASE__ 1
-+// CHECK_TRM_M64: #define __FXSR__ 1
-+// CHECK_TRM_M64: #define __GFNI__ 1
-+// CHECK_TRM_M64: #define __MMX__ 1
-+// CHECK_TRM_M64: #define __MOVBE__ 1
-+// CHECK_TRM_M64-NOT: #define __MOVDIR64B__ 1
-+// CHECK_TRM_M64-NOT: #define __MOVDIRI__ 1
-+// CHECK_TRM_M64: #define __PCLMUL__ 1
-+// CHECK_TRM_M64: #define __POPCNT__ 1
-+// CHECK_TRM_M64: #define __PRFCHW__ 1
-+// CHECK_TRM_M64: #define __PTWRITE__ 1
-+// CHECK_TRM_M64: #define __RDPID__ 1
-+// CHECK_TRM_M64: #define __RDRND__ 1
-+// CHECK_TRM_M64: #define __RDSEED__ 1
-+// CHECK_TRM_M64: #define __SGX__ 1
-+// CHECK_TRM_M64: #define __SHA__ 1
-+// CHECK_TRM_M64: #define __SSE2__ 1
-+// CHECK_TRM_M64: #define __SSE3__ 1
-+// CHECK_TRM_M64: #define __SSE4_1__ 1
-+// CHECK_TRM_M64: #define __SSE4_2__ 1
-+// CHECK_TRM_M64: #define __SSE__ 1
-+// CHECK_TRM_M64: #define __SSSE3__ 1
-+// CHECK_TRM_M64-NOT: #define __WAITPKG__ 1
-+// CHECK_TRM_M64: #define __XSAVEC__ 1
-+// CHECK_TRM_M64: #define __XSAVEOPT__ 1
-+// CHECK_TRM_M64: #define __XSAVES__ 1
-+// CHECK_TRM_M64: #define __XSAVE__ 1
-+// CHECK_TRM_M64: #define __tremont 1
-+// CHECK_TRM_M64: #define __tremont__ 1
-+// CHECK_TRM_M64: #define __tune_tremont__ 1
-+// CHECK_TRM_M64: #define __x86_64 1
-+// CHECK_TRM_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=slm -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SLM_M32
-+// CHECK_SLM_M32: #define __FXSR__ 1
-+// CHECK_SLM_M32: #define __MMX__ 1
-+// CHECK_SLM_M32: #define __MOVBE__ 1
-+// CHECK_SLM_M32: #define __PCLMUL__ 1
-+// CHECK_SLM_M32: #define __POPCNT__ 1
-+// CHECK_SLM_M32: #define __PRFCHW__ 1
-+// CHECK_SLM_M32: #define __RDRND__ 1
-+// CHECK_SLM_M32: #define __SSE2__ 1
-+// CHECK_SLM_M32: #define __SSE3__ 1
-+// CHECK_SLM_M32: #define __SSE4_1__ 1
-+// CHECK_SLM_M32: #define __SSE4_2__ 1
-+// CHECK_SLM_M32: #define __SSE__ 1
-+// CHECK_SLM_M32: #define __SSSE3__ 1
-+// CHECK_SLM_M32: #define __i386 1
-+// CHECK_SLM_M32: #define __i386__ 1
-+// CHECK_SLM_M32: #define __slm 1
-+// CHECK_SLM_M32: #define __slm__ 1
-+// CHECK_SLM_M32: #define __tune_slm__ 1
-+// CHECK_SLM_M32: #define i386 1
-+
-+// RUN: %clang -march=slm -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SLM_M64
-+// CHECK_SLM_M64: #define __FXSR__ 1
-+// CHECK_SLM_M64: #define __MMX__ 1
-+// CHECK_SLM_M64: #define __MOVBE__ 1
-+// CHECK_SLM_M64: #define __PCLMUL__ 1
-+// CHECK_SLM_M64: #define __POPCNT__ 1
-+// CHECK_SLM_M64: #define __PRFCHW__ 1
-+// CHECK_SLM_M64: #define __RDRND__ 1
-+// CHECK_SLM_M64: #define __SSE2_MATH__ 1
-+// CHECK_SLM_M64: #define __SSE2__ 1
-+// CHECK_SLM_M64: #define __SSE3__ 1
-+// CHECK_SLM_M64: #define __SSE4_1__ 1
-+// CHECK_SLM_M64: #define __SSE4_2__ 1
-+// CHECK_SLM_M64: #define __SSE_MATH__ 1
-+// CHECK_SLM_M64: #define __SSE__ 1
-+// CHECK_SLM_M64: #define __SSSE3__ 1
-+// CHECK_SLM_M64: #define __amd64 1
-+// CHECK_SLM_M64: #define __amd64__ 1
-+// CHECK_SLM_M64: #define __slm 1
-+// CHECK_SLM_M64: #define __slm__ 1
-+// CHECK_SLM_M64: #define __tune_slm__ 1
-+// CHECK_SLM_M64: #define __x86_64 1
-+// CHECK_SLM_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=lakemont -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck %s -check-prefix=CHECK_LAKEMONT_M32
-+// CHECK_LAKEMONT_M32: #define __i386 1
-+// CHECK_LAKEMONT_M32: #define __i386__ 1
-+// CHECK_LAKEMONT_M32: #define __i586 1
-+// CHECK_LAKEMONT_M32: #define __i586__ 1
-+// CHECK_LAKEMONT_M32: #define __pentium 1
-+// CHECK_LAKEMONT_M32: #define __pentium__ 1
-+// CHECK_LAKEMONT_M32: #define __tune_lakemont__ 1
-+// CHECK_LAKEMONT_M32: #define i386 1
-+// RUN: not %clang -march=lakemont -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck %s -check-prefix=CHECK_LAKEMONT_M64
-+// CHECK_LAKEMONT_M64: error:
-+
-+// RUN: %clang -march=geode -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_GEODE_M32
-+// CHECK_GEODE_M32: #define __3dNOW_A__ 1
-+// CHECK_GEODE_M32: #define __3dNOW__ 1
-+// CHECK_GEODE_M32: #define __MMX__ 1
-+// CHECK_GEODE_M32: #define __geode 1
-+// CHECK_GEODE_M32: #define __geode__ 1
-+// CHECK_GEODE_M32: #define __i386 1
-+// CHECK_GEODE_M32: #define __i386__ 1
-+// CHECK_GEODE_M32: #define __tune_geode__ 1
-+// CHECK_GEODE_M32: #define i386 1
-+// RUN: not %clang -march=geode -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_GEODE_M64
-+// CHECK_GEODE_M64: error: {{.*}}
-+
-+// RUN: %clang -march=k6 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_M32
-+// CHECK_K6_M32: #define __MMX__ 1
-+// CHECK_K6_M32: #define __i386 1
-+// CHECK_K6_M32: #define __i386__ 1
-+// CHECK_K6_M32: #define __k6 1
-+// CHECK_K6_M32: #define __k6__ 1
-+// CHECK_K6_M32: #define __tune_k6__ 1
-+// CHECK_K6_M32: #define i386 1
-+// RUN: not %clang -march=k6 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_M64
-+// CHECK_K6_M64: error: {{.*}}
-+
-+// RUN: %clang -march=k6-2 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_2_M32
-+// CHECK_K6_2_M32: #define __3dNOW__ 1
-+// CHECK_K6_2_M32: #define __MMX__ 1
-+// CHECK_K6_2_M32: #define __i386 1
-+// CHECK_K6_2_M32: #define __i386__ 1
-+// CHECK_K6_2_M32: #define __k6 1
-+// CHECK_K6_2_M32: #define __k6_2__ 1
-+// CHECK_K6_2_M32: #define __k6__ 1
-+// CHECK_K6_2_M32: #define __tune_k6_2__ 1
-+// CHECK_K6_2_M32: #define __tune_k6__ 1
-+// CHECK_K6_2_M32: #define i386 1
-+// RUN: not %clang -march=k6-2 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_2_M64
-+// CHECK_K6_2_M64: error: {{.*}}
-+
-+// RUN: %clang -march=k6-3 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_3_M32
-+// CHECK_K6_3_M32: #define __3dNOW__ 1
-+// CHECK_K6_3_M32: #define __MMX__ 1
-+// CHECK_K6_3_M32: #define __i386 1
-+// CHECK_K6_3_M32: #define __i386__ 1
-+// CHECK_K6_3_M32: #define __k6 1
-+// CHECK_K6_3_M32: #define __k6_3__ 1
-+// CHECK_K6_3_M32: #define __k6__ 1
-+// CHECK_K6_3_M32: #define __tune_k6_3__ 1
-+// CHECK_K6_3_M32: #define __tune_k6__ 1
-+// CHECK_K6_3_M32: #define i386 1
-+// RUN: not %clang -march=k6-3 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_3_M64
-+// CHECK_K6_3_M64: error: {{.*}}
-+
-+// RUN: %clang -march=athlon -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_M32
-+// CHECK_ATHLON_M32: #define __3dNOW_A__ 1
-+// CHECK_ATHLON_M32: #define __3dNOW__ 1
-+// CHECK_ATHLON_M32: #define __MMX__ 1
-+// CHECK_ATHLON_M32: #define __athlon 1
-+// CHECK_ATHLON_M32: #define __athlon__ 1
-+// CHECK_ATHLON_M32: #define __i386 1
-+// CHECK_ATHLON_M32: #define __i386__ 1
-+// CHECK_ATHLON_M32: #define __tune_athlon__ 1
-+// CHECK_ATHLON_M32: #define i386 1
-+// RUN: not %clang -march=athlon -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_M64
-+// CHECK_ATHLON_M64: error: {{.*}}
-+
-+// RUN: %clang -march=athlon-tbird -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_TBIRD_M32
-+// CHECK_ATHLON_TBIRD_M32: #define __3dNOW_A__ 1
-+// CHECK_ATHLON_TBIRD_M32: #define __3dNOW__ 1
-+// CHECK_ATHLON_TBIRD_M32: #define __MMX__ 1
-+// CHECK_ATHLON_TBIRD_M32: #define __athlon 1
-+// CHECK_ATHLON_TBIRD_M32: #define __athlon__ 1
-+// CHECK_ATHLON_TBIRD_M32: #define __i386 1
-+// CHECK_ATHLON_TBIRD_M32: #define __i386__ 1
-+// CHECK_ATHLON_TBIRD_M32: #define __tune_athlon__ 1
-+// CHECK_ATHLON_TBIRD_M32: #define i386 1
-+// RUN: not %clang -march=athlon-tbird -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_TBIRD_M64
-+// CHECK_ATHLON_TBIRD_M64: error: {{.*}}
-+
-+// RUN: %clang -march=athlon-4 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_4_M32
-+// CHECK_ATHLON_4_M32: #define __3dNOW_A__ 1
-+// CHECK_ATHLON_4_M32: #define __3dNOW__ 1
-+// CHECK_ATHLON_4_M32: #define __MMX__ 1
-+// CHECK_ATHLON_4_M32: #define __SSE__ 1
-+// CHECK_ATHLON_4_M32: #define __athlon 1
-+// CHECK_ATHLON_4_M32: #define __athlon__ 1
-+// CHECK_ATHLON_4_M32: #define __athlon_sse__ 1
-+// CHECK_ATHLON_4_M32: #define __i386 1
-+// CHECK_ATHLON_4_M32: #define __i386__ 1
-+// CHECK_ATHLON_4_M32: #define __tune_athlon__ 1
-+// CHECK_ATHLON_4_M32: #define __tune_athlon_sse__ 1
-+// CHECK_ATHLON_4_M32: #define i386 1
-+// RUN: not %clang -march=athlon-4 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_4_M64
-+// CHECK_ATHLON_4_M64: error: {{.*}}
-+
-+// RUN: %clang -march=athlon-xp -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_XP_M32
-+// CHECK_ATHLON_XP_M32: #define __3dNOW_A__ 1
-+// CHECK_ATHLON_XP_M32: #define __3dNOW__ 1
-+// CHECK_ATHLON_XP_M32: #define __MMX__ 1
-+// CHECK_ATHLON_XP_M32: #define __SSE__ 1
-+// CHECK_ATHLON_XP_M32: #define __athlon 1
-+// CHECK_ATHLON_XP_M32: #define __athlon__ 1
-+// CHECK_ATHLON_XP_M32: #define __athlon_sse__ 1
-+// CHECK_ATHLON_XP_M32: #define __i386 1
-+// CHECK_ATHLON_XP_M32: #define __i386__ 1
-+// CHECK_ATHLON_XP_M32: #define __tune_athlon__ 1
-+// CHECK_ATHLON_XP_M32: #define __tune_athlon_sse__ 1
-+// CHECK_ATHLON_XP_M32: #define i386 1
-+// RUN: not %clang -march=athlon-xp -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_XP_M64
-+// CHECK_ATHLON_XP_M64: error: {{.*}}
-+
-+// RUN: %clang -march=athlon-mp -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_MP_M32
-+// CHECK_ATHLON_MP_M32: #define __3dNOW_A__ 1
-+// CHECK_ATHLON_MP_M32: #define __3dNOW__ 1
-+// CHECK_ATHLON_MP_M32: #define __MMX__ 1
-+// CHECK_ATHLON_MP_M32: #define __SSE__ 1
-+// CHECK_ATHLON_MP_M32: #define __athlon 1
-+// CHECK_ATHLON_MP_M32: #define __athlon__ 1
-+// CHECK_ATHLON_MP_M32: #define __athlon_sse__ 1
-+// CHECK_ATHLON_MP_M32: #define __i386 1
-+// CHECK_ATHLON_MP_M32: #define __i386__ 1
-+// CHECK_ATHLON_MP_M32: #define __tune_athlon__ 1
-+// CHECK_ATHLON_MP_M32: #define __tune_athlon_sse__ 1
-+// CHECK_ATHLON_MP_M32: #define i386 1
-+// RUN: not %clang -march=athlon-mp -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_MP_M64
-+// CHECK_ATHLON_MP_M64: error: {{.*}}
-+
-+// RUN: %clang -march=x86-64 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_X86_64_M32
-+// CHECK_X86_64_M32: #define __MMX__ 1
-+// CHECK_X86_64_M32: #define __SSE2__ 1
-+// CHECK_X86_64_M32: #define __SSE__ 1
-+// CHECK_X86_64_M32: #define __i386 1
-+// CHECK_X86_64_M32: #define __i386__ 1
-+// CHECK_X86_64_M32: #define __k8 1
-+// CHECK_X86_64_M32: #define __k8__ 1
-+// CHECK_X86_64_M32: #define i386 1
-+
-+// RUN: %clang -march=k8 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K8_M32
-+// CHECK_K8_M32: #define __3dNOW_A__ 1
-+// CHECK_K8_M32: #define __3dNOW__ 1
-+// CHECK_K8_M32: #define __MMX__ 1
-+// CHECK_K8_M32: #define __SSE2__ 1
-+// CHECK_K8_M32: #define __SSE__ 1
-+// CHECK_K8_M32: #define __i386 1
-+// CHECK_K8_M32: #define __i386__ 1
-+// CHECK_K8_M32: #define __k8 1
-+// CHECK_K8_M32: #define __k8__ 1
-+// CHECK_K8_M32: #define __tune_k8__ 1
-+// CHECK_K8_M32: #define i386 1
-+
-+// RUN: %clang -march=k8 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K8_M64
-+// CHECK_K8_M64: #define __3dNOW_A__ 1
-+// CHECK_K8_M64: #define __3dNOW__ 1
-+// CHECK_K8_M64: #define __MMX__ 1
-+// CHECK_K8_M64: #define __SSE2_MATH__ 1
-+// CHECK_K8_M64: #define __SSE2__ 1
-+// CHECK_K8_M64: #define __SSE_MATH__ 1
-+// CHECK_K8_M64: #define __SSE__ 1
-+// CHECK_K8_M64: #define __amd64 1
-+// CHECK_K8_M64: #define __amd64__ 1
-+// CHECK_K8_M64: #define __k8 1
-+// CHECK_K8_M64: #define __k8__ 1
-+// CHECK_K8_M64: #define __tune_k8__ 1
-+// CHECK_K8_M64: #define __x86_64 1
-+// CHECK_K8_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=k8-sse3 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K8_SSE3_M32
-+// CHECK_K8_SSE3_M32: #define __3dNOW_A__ 1
-+// CHECK_K8_SSE3_M32: #define __3dNOW__ 1
-+// CHECK_K8_SSE3_M32: #define __MMX__ 1
-+// CHECK_K8_SSE3_M32: #define __SSE2__ 1
-+// CHECK_K8_SSE3_M32: #define __SSE3__ 1
-+// CHECK_K8_SSE3_M32: #define __SSE__ 1
-+// CHECK_K8_SSE3_M32: #define __i386 1
-+// CHECK_K8_SSE3_M32: #define __i386__ 1
-+// CHECK_K8_SSE3_M32: #define __k8 1
-+// CHECK_K8_SSE3_M32: #define __k8__ 1
-+// CHECK_K8_SSE3_M32: #define __tune_k8__ 1
-+// CHECK_K8_SSE3_M32: #define i386 1
-+
-+// RUN: %clang -march=k8-sse3 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_K8_SSE3_M64
-+// CHECK_K8_SSE3_M64: #define __3dNOW_A__ 1
-+// CHECK_K8_SSE3_M64: #define __3dNOW__ 1
-+// CHECK_K8_SSE3_M64: #define __MMX__ 1
-+// CHECK_K8_SSE3_M64: #define __SSE2_MATH__ 1
-+// CHECK_K8_SSE3_M64: #define __SSE2__ 1
-+// CHECK_K8_SSE3_M64: #define __SSE3__ 1
-+// CHECK_K8_SSE3_M64: #define __SSE_MATH__ 1
-+// CHECK_K8_SSE3_M64: #define __SSE__ 1
-+// CHECK_K8_SSE3_M64: #define __amd64 1
-+// CHECK_K8_SSE3_M64: #define __amd64__ 1
-+// CHECK_K8_SSE3_M64: #define __k8 1
-+// CHECK_K8_SSE3_M64: #define __k8__ 1
-+// CHECK_K8_SSE3_M64: #define __tune_k8__ 1
-+// CHECK_K8_SSE3_M64: #define __x86_64 1
-+// CHECK_K8_SSE3_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=opteron -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_OPTERON_M32
-+// CHECK_OPTERON_M32: #define __3dNOW_A__ 1
-+// CHECK_OPTERON_M32: #define __3dNOW__ 1
-+// CHECK_OPTERON_M32: #define __MMX__ 1
-+// CHECK_OPTERON_M32: #define __SSE2__ 1
-+// CHECK_OPTERON_M32: #define __SSE__ 1
-+// CHECK_OPTERON_M32: #define __i386 1
-+// CHECK_OPTERON_M32: #define __i386__ 1
-+// CHECK_OPTERON_M32: #define __k8 1
-+// CHECK_OPTERON_M32: #define __k8__ 1
-+// CHECK_OPTERON_M32: #define __tune_k8__ 1
-+// CHECK_OPTERON_M32: #define i386 1
-+
-+// RUN: %clang -march=opteron -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_OPTERON_M64
-+// CHECK_OPTERON_M64: #define __3dNOW_A__ 1
-+// CHECK_OPTERON_M64: #define __3dNOW__ 1
-+// CHECK_OPTERON_M64: #define __MMX__ 1
-+// CHECK_OPTERON_M64: #define __SSE2_MATH__ 1
-+// CHECK_OPTERON_M64: #define __SSE2__ 1
-+// CHECK_OPTERON_M64: #define __SSE_MATH__ 1
-+// CHECK_OPTERON_M64: #define __SSE__ 1
-+// CHECK_OPTERON_M64: #define __amd64 1
-+// CHECK_OPTERON_M64: #define __amd64__ 1
-+// CHECK_OPTERON_M64: #define __k8 1
-+// CHECK_OPTERON_M64: #define __k8__ 1
-+// CHECK_OPTERON_M64: #define __tune_k8__ 1
-+// CHECK_OPTERON_M64: #define __x86_64 1
-+// CHECK_OPTERON_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=opteron-sse3 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_OPTERON_SSE3_M32
-+// CHECK_OPTERON_SSE3_M32: #define __3dNOW_A__ 1
-+// CHECK_OPTERON_SSE3_M32: #define __3dNOW__ 1
-+// CHECK_OPTERON_SSE3_M32: #define __MMX__ 1
-+// CHECK_OPTERON_SSE3_M32: #define __SSE2__ 1
-+// CHECK_OPTERON_SSE3_M32: #define __SSE3__ 1
-+// CHECK_OPTERON_SSE3_M32: #define __SSE__ 1
-+// CHECK_OPTERON_SSE3_M32: #define __i386 1
-+// CHECK_OPTERON_SSE3_M32: #define __i386__ 1
-+// CHECK_OPTERON_SSE3_M32: #define __k8 1
-+// CHECK_OPTERON_SSE3_M32: #define __k8__ 1
-+// CHECK_OPTERON_SSE3_M32: #define __tune_k8__ 1
-+// CHECK_OPTERON_SSE3_M32: #define i386 1
-+
-+// RUN: %clang -march=opteron-sse3 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_OPTERON_SSE3_M64
-+// CHECK_OPTERON_SSE3_M64: #define __3dNOW_A__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __3dNOW__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __MMX__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __SSE2_MATH__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __SSE2__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __SSE3__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __SSE_MATH__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __SSE__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __amd64 1
-+// CHECK_OPTERON_SSE3_M64: #define __amd64__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __k8 1
-+// CHECK_OPTERON_SSE3_M64: #define __k8__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __tune_k8__ 1
-+// CHECK_OPTERON_SSE3_M64: #define __x86_64 1
-+// CHECK_OPTERON_SSE3_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=athlon64 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON64_M32
-+// CHECK_ATHLON64_M32: #define __3dNOW_A__ 1
-+// CHECK_ATHLON64_M32: #define __3dNOW__ 1
-+// CHECK_ATHLON64_M32: #define __MMX__ 1
-+// CHECK_ATHLON64_M32: #define __SSE2__ 1
-+// CHECK_ATHLON64_M32: #define __SSE__ 1
-+// CHECK_ATHLON64_M32: #define __i386 1
-+// CHECK_ATHLON64_M32: #define __i386__ 1
-+// CHECK_ATHLON64_M32: #define __k8 1
-+// CHECK_ATHLON64_M32: #define __k8__ 1
-+// CHECK_ATHLON64_M32: #define __tune_k8__ 1
-+// CHECK_ATHLON64_M32: #define i386 1
-+
-+// RUN: %clang -march=athlon64 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON64_M64
-+// CHECK_ATHLON64_M64: #define __3dNOW_A__ 1
-+// CHECK_ATHLON64_M64: #define __3dNOW__ 1
-+// CHECK_ATHLON64_M64: #define __MMX__ 1
-+// CHECK_ATHLON64_M64: #define __SSE2_MATH__ 1
-+// CHECK_ATHLON64_M64: #define __SSE2__ 1
-+// CHECK_ATHLON64_M64: #define __SSE_MATH__ 1
-+// CHECK_ATHLON64_M64: #define __SSE__ 1
-+// CHECK_ATHLON64_M64: #define __amd64 1
-+// CHECK_ATHLON64_M64: #define __amd64__ 1
-+// CHECK_ATHLON64_M64: #define __k8 1
-+// CHECK_ATHLON64_M64: #define __k8__ 1
-+// CHECK_ATHLON64_M64: #define __tune_k8__ 1
-+// CHECK_ATHLON64_M64: #define __x86_64 1
-+// CHECK_ATHLON64_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=athlon64-sse3 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON64_SSE3_M32
-+// CHECK_ATHLON64_SSE3_M32: #define __3dNOW_A__ 1
-+// CHECK_ATHLON64_SSE3_M32: #define __3dNOW__ 1
-+// CHECK_ATHLON64_SSE3_M32: #define __MMX__ 1
-+// CHECK_ATHLON64_SSE3_M32: #define __SSE2__ 1
-+// CHECK_ATHLON64_SSE3_M32: #define __SSE3__ 1
-+// CHECK_ATHLON64_SSE3_M32: #define __SSE__ 1
-+// CHECK_ATHLON64_SSE3_M32: #define __i386 1
-+// CHECK_ATHLON64_SSE3_M32: #define __i386__ 1
-+// CHECK_ATHLON64_SSE3_M32: #define __k8 1
-+// CHECK_ATHLON64_SSE3_M32: #define __k8__ 1
-+// CHECK_ATHLON64_SSE3_M32: #define __tune_k8__ 1
-+// CHECK_ATHLON64_SSE3_M32: #define i386 1
-+
-+// RUN: %clang -march=athlon64-sse3 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON64_SSE3_M64
-+// CHECK_ATHLON64_SSE3_M64: #define __3dNOW_A__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __3dNOW__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __MMX__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __SSE2_MATH__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __SSE2__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __SSE3__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __SSE_MATH__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __SSE__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __amd64 1
-+// CHECK_ATHLON64_SSE3_M64: #define __amd64__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __k8 1
-+// CHECK_ATHLON64_SSE3_M64: #define __k8__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __tune_k8__ 1
-+// CHECK_ATHLON64_SSE3_M64: #define __x86_64 1
-+// CHECK_ATHLON64_SSE3_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=athlon-fx -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_FX_M32
-+// CHECK_ATHLON_FX_M32: #define __3dNOW_A__ 1
-+// CHECK_ATHLON_FX_M32: #define __3dNOW__ 1
-+// CHECK_ATHLON_FX_M32: #define __MMX__ 1
-+// CHECK_ATHLON_FX_M32: #define __SSE2__ 1
-+// CHECK_ATHLON_FX_M32: #define __SSE__ 1
-+// CHECK_ATHLON_FX_M32: #define __i386 1
-+// CHECK_ATHLON_FX_M32: #define __i386__ 1
-+// CHECK_ATHLON_FX_M32: #define __k8 1
-+// CHECK_ATHLON_FX_M32: #define __k8__ 1
-+// CHECK_ATHLON_FX_M32: #define __tune_k8__ 1
-+// CHECK_ATHLON_FX_M32: #define i386 1
-+
-+// RUN: %clang -march=athlon-fx -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_FX_M64
-+// CHECK_ATHLON_FX_M64: #define __3dNOW_A__ 1
-+// CHECK_ATHLON_FX_M64: #define __3dNOW__ 1
-+// CHECK_ATHLON_FX_M64: #define __MMX__ 1
-+// CHECK_ATHLON_FX_M64: #define __SSE2_MATH__ 1
-+// CHECK_ATHLON_FX_M64: #define __SSE2__ 1
-+// CHECK_ATHLON_FX_M64: #define __SSE_MATH__ 1
-+// CHECK_ATHLON_FX_M64: #define __SSE__ 1
-+// CHECK_ATHLON_FX_M64: #define __amd64 1
-+// CHECK_ATHLON_FX_M64: #define __amd64__ 1
-+// CHECK_ATHLON_FX_M64: #define __k8 1
-+// CHECK_ATHLON_FX_M64: #define __k8__ 1
-+// CHECK_ATHLON_FX_M64: #define __tune_k8__ 1
-+// CHECK_ATHLON_FX_M64: #define __x86_64 1
-+// CHECK_ATHLON_FX_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=amdfam10 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_AMDFAM10_M32
-+// CHECK_AMDFAM10_M32: #define __3dNOW_A__ 1
-+// CHECK_AMDFAM10_M32: #define __3dNOW__ 1
-+// CHECK_AMDFAM10_M32: #define __LAHF_SAHF__ 1
-+// CHECK_AMDFAM10_M32: #define __LZCNT__ 1
-+// CHECK_AMDFAM10_M32: #define __MMX__ 1
-+// CHECK_AMDFAM10_M32: #define __POPCNT__ 1
-+// CHECK_AMDFAM10_M32: #define __PRFCHW__ 1
-+// CHECK_AMDFAM10_M32: #define __SSE2_MATH__ 1
-+// CHECK_AMDFAM10_M32: #define __SSE2__ 1
-+// CHECK_AMDFAM10_M32: #define __SSE3__ 1
-+// CHECK_AMDFAM10_M32: #define __SSE4A__ 1
-+// CHECK_AMDFAM10_M32: #define __SSE_MATH__ 1
-+// CHECK_AMDFAM10_M32: #define __SSE__ 1
-+// CHECK_AMDFAM10_M32-NOT: #define __SSSE3__ 1
-+// CHECK_AMDFAM10_M32: #define __amdfam10 1
-+// CHECK_AMDFAM10_M32: #define __amdfam10__ 1
-+// CHECK_AMDFAM10_M32: #define __i386 1
-+// CHECK_AMDFAM10_M32: #define __i386__ 1
-+// CHECK_AMDFAM10_M32: #define __tune_amdfam10__ 1
-+
-+// RUN: %clang -march=amdfam10 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_AMDFAM10_M64
-+// CHECK_AMDFAM10_M64: #define __3dNOW_A__ 1
-+// CHECK_AMDFAM10_M64: #define __3dNOW__ 1
-+// CHECK_AMDFAM10_M64: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 1
-+// CHECK_AMDFAM10_M64: #define __LAHF_SAHF__ 1
-+// CHECK_AMDFAM10_M64: #define __LZCNT__ 1
-+// CHECK_AMDFAM10_M64: #define __MMX__ 1
-+// CHECK_AMDFAM10_M64: #define __POPCNT__ 1
-+// CHECK_AMDFAM10_M64: #define __PRFCHW__ 1
-+// CHECK_AMDFAM10_M64: #define __SSE2_MATH__ 1
-+// CHECK_AMDFAM10_M64: #define __SSE2__ 1
-+// CHECK_AMDFAM10_M64: #define __SSE3__ 1
-+// CHECK_AMDFAM10_M64: #define __SSE4A__ 1
-+// CHECK_AMDFAM10_M64: #define __SSE_MATH__ 1
-+// CHECK_AMDFAM10_M64: #define __SSE__ 1
-+// CHECK_AMDFAM10_M64-NOT: #define __SSSE3__ 1
-+// CHECK_AMDFAM10_M64: #define __amd64 1
-+// CHECK_AMDFAM10_M64: #define __amd64__ 1
-+// CHECK_AMDFAM10_M64: #define __amdfam10 1
-+// CHECK_AMDFAM10_M64: #define __amdfam10__ 1
-+// CHECK_AMDFAM10_M64: #define __tune_amdfam10__ 1
-+// CHECK_AMDFAM10_M64: #define __x86_64 1
-+// CHECK_AMDFAM10_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=btver1 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BTVER1_M32
-+// CHECK_BTVER1_M32-NOT: #define __3dNOW_A__ 1
-+// CHECK_BTVER1_M32-NOT: #define __3dNOW__ 1
-+// CHECK_BTVER1_M32: #define __LAHF_SAHF__ 1
-+// CHECK_BTVER1_M32: #define __LZCNT__ 1
-+// CHECK_BTVER1_M32: #define __MMX__ 1
-+// CHECK_BTVER1_M32: #define __POPCNT__ 1
-+// CHECK_BTVER1_M32: #define __PRFCHW__ 1
-+// CHECK_BTVER1_M32: #define __SSE2_MATH__ 1
-+// CHECK_BTVER1_M32: #define __SSE2__ 1
-+// CHECK_BTVER1_M32: #define __SSE3__ 1
-+// CHECK_BTVER1_M32: #define __SSE4A__ 1
-+// CHECK_BTVER1_M32: #define __SSE_MATH__ 1
-+// CHECK_BTVER1_M32: #define __SSE__ 1
-+// CHECK_BTVER1_M32: #define __SSSE3__ 1
-+// CHECK_BTVER1_M32: #define __btver1 1
-+// CHECK_BTVER1_M32: #define __btver1__ 1
-+// CHECK_BTVER1_M32: #define __i386 1
-+// CHECK_BTVER1_M32: #define __i386__ 1
-+// CHECK_BTVER1_M32: #define __tune_btver1__ 1
-+
-+// RUN: %clang -march=btver1 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BTVER1_M64
-+// CHECK_BTVER1_M64-NOT: #define __3dNOW_A__ 1
-+// CHECK_BTVER1_M64-NOT: #define __3dNOW__ 1
-+// CHECK_BTVER1_M64: #define __LAHF_SAHF__ 1
-+// CHECK_BTVER1_M64: #define __LZCNT__ 1
-+// CHECK_BTVER1_M64: #define __MMX__ 1
-+// CHECK_BTVER1_M64: #define __POPCNT__ 1
-+// CHECK_BTVER1_M64: #define __PRFCHW__ 1
-+// CHECK_BTVER1_M64: #define __SSE2_MATH__ 1
-+// CHECK_BTVER1_M64: #define __SSE2__ 1
-+// CHECK_BTVER1_M64: #define __SSE3__ 1
-+// CHECK_BTVER1_M64: #define __SSE4A__ 1
-+// CHECK_BTVER1_M64: #define __SSE_MATH__ 1
-+// CHECK_BTVER1_M64: #define __SSE__ 1
-+// CHECK_BTVER1_M64: #define __SSSE3__ 1
-+// CHECK_BTVER1_M64: #define __amd64 1
-+// CHECK_BTVER1_M64: #define __amd64__ 1
-+// CHECK_BTVER1_M64: #define __btver1 1
-+// CHECK_BTVER1_M64: #define __btver1__ 1
-+// CHECK_BTVER1_M64: #define __tune_btver1__ 1
-+// CHECK_BTVER1_M64: #define __x86_64 1
-+// CHECK_BTVER1_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=btver2 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BTVER2_M32
-+// CHECK_BTVER2_M32-NOT: #define __3dNOW_A__ 1
-+// CHECK_BTVER2_M32-NOT: #define __3dNOW__ 1
-+// CHECK_BTVER2_M32: #define __AES__ 1
-+// CHECK_BTVER2_M32: #define __AVX__ 1
-+// CHECK_BTVER2_M32: #define __BMI__ 1
-+// CHECK_BTVER2_M32: #define __F16C__ 1
-+// CHECK_BTVER2_M32: #define __LZCNT__ 1
-+// CHECK_BTVER2_M32: #define __MMX__ 1
-+// CHECK_BTVER2_M32: #define __MOVBE__ 1
-+// CHECK_BTVER2_M32: #define __PCLMUL__ 1
-+// CHECK_BTVER2_M32: #define __POPCNT__ 1
-+// CHECK_BTVER2_M32: #define __PRFCHW__ 1
-+// CHECK_BTVER2_M32: #define __SSE2_MATH__ 1
-+// CHECK_BTVER2_M32: #define __SSE2__ 1
-+// CHECK_BTVER2_M32: #define __SSE3__ 1
-+// CHECK_BTVER2_M32: #define __SSE4A__ 1
-+// CHECK_BTVER2_M32: #define __SSE_MATH__ 1
-+// CHECK_BTVER2_M32: #define __SSE__ 1
-+// CHECK_BTVER2_M32: #define __SSSE3__ 1
-+// CHECK_BTVER2_M32: #define __XSAVEOPT__ 1
-+// CHECK_BTVER2_M32: #define __XSAVE__ 1
-+// CHECK_BTVER2_M32: #define __btver2 1
-+// CHECK_BTVER2_M32: #define __btver2__ 1
-+// CHECK_BTVER2_M32: #define __i386 1
-+// CHECK_BTVER2_M32: #define __i386__ 1
-+// CHECK_BTVER2_M32: #define __tune_btver2__ 1
-+
-+// RUN: %clang -march=btver2 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BTVER2_M64
-+// CHECK_BTVER2_M64-NOT: #define __3dNOW_A__ 1
-+// CHECK_BTVER2_M64-NOT: #define __3dNOW__ 1
-+// CHECK_BTVER2_M64: #define __AES__ 1
-+// CHECK_BTVER2_M64: #define __AVX__ 1
-+// CHECK_BTVER2_M64: #define __BMI__ 1
-+// CHECK_BTVER2_M64: #define __F16C__ 1
-+// CHECK_BTVER2_M64: #define __LZCNT__ 1
-+// CHECK_BTVER2_M64: #define __MMX__ 1
-+// CHECK_BTVER2_M64: #define __MOVBE__ 1
-+// CHECK_BTVER2_M64: #define __PCLMUL__ 1
-+// CHECK_BTVER2_M64: #define __POPCNT__ 1
-+// CHECK_BTVER2_M64: #define __PRFCHW__ 1
-+// CHECK_BTVER2_M64: #define __SSE2_MATH__ 1
-+// CHECK_BTVER2_M64: #define __SSE2__ 1
-+// CHECK_BTVER2_M64: #define __SSE3__ 1
-+// CHECK_BTVER2_M64: #define __SSE4A__ 1
-+// CHECK_BTVER2_M64: #define __SSE_MATH__ 1
-+// CHECK_BTVER2_M64: #define __SSE__ 1
-+// CHECK_BTVER2_M64: #define __SSSE3__ 1
-+// CHECK_BTVER2_M64: #define __XSAVEOPT__ 1
-+// CHECK_BTVER2_M64: #define __XSAVE__ 1
-+// CHECK_BTVER2_M64: #define __amd64 1
-+// CHECK_BTVER2_M64: #define __amd64__ 1
-+// CHECK_BTVER2_M64: #define __btver2 1
-+// CHECK_BTVER2_M64: #define __btver2__ 1
-+// CHECK_BTVER2_M64: #define __tune_btver2__ 1
-+// CHECK_BTVER2_M64: #define __x86_64 1
-+// CHECK_BTVER2_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=bdver1 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER1_M32
-+// CHECK_BDVER1_M32-NOT: #define __3dNOW_A__ 1
-+// CHECK_BDVER1_M32-NOT: #define __3dNOW__ 1
-+// CHECK_BDVER1_M32: #define __AES__ 1
-+// CHECK_BDVER1_M32: #define __AVX__ 1
-+// CHECK_BDVER1_M32: #define __FMA4__ 1
-+// CHECK_BDVER1_M32: #define __LWP__ 1
-+// CHECK_BDVER1_M32: #define __LZCNT__ 1
-+// CHECK_BDVER1_M32: #define __MMX__ 1
-+// CHECK_BDVER1_M32: #define __PCLMUL__ 1
-+// CHECK_BDVER1_M32: #define __POPCNT__ 1
-+// CHECK_BDVER1_M32: #define __PRFCHW__ 1
-+// CHECK_BDVER1_M32: #define __SSE2_MATH__ 1
-+// CHECK_BDVER1_M32: #define __SSE2__ 1
-+// CHECK_BDVER1_M32: #define __SSE3__ 1
-+// CHECK_BDVER1_M32: #define __SSE4A__ 1
-+// CHECK_BDVER1_M32: #define __SSE4_1__ 1
-+// CHECK_BDVER1_M32: #define __SSE4_2__ 1
-+// CHECK_BDVER1_M32: #define __SSE_MATH__ 1
-+// CHECK_BDVER1_M32: #define __SSE__ 1
-+// CHECK_BDVER1_M32: #define __SSSE3__ 1
-+// CHECK_BDVER1_M32: #define __XOP__ 1
-+// CHECK_BDVER1_M32: #define __XSAVE__ 1
-+// CHECK_BDVER1_M32: #define __bdver1 1
-+// CHECK_BDVER1_M32: #define __bdver1__ 1
-+// CHECK_BDVER1_M32: #define __i386 1
-+// CHECK_BDVER1_M32: #define __i386__ 1
-+// CHECK_BDVER1_M32: #define __tune_bdver1__ 1
-+
-+// RUN: %clang -march=bdver1 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER1_M64
-+// CHECK_BDVER1_M64-NOT: #define __3dNOW_A__ 1
-+// CHECK_BDVER1_M64-NOT: #define __3dNOW__ 1
-+// CHECK_BDVER1_M64: #define __AES__ 1
-+// CHECK_BDVER1_M64: #define __AVX__ 1
-+// CHECK_BDVER1_M64: #define __FMA4__ 1
-+// CHECK_BDVER1_M64: #define __LWP__ 1
-+// CHECK_BDVER1_M64: #define __LZCNT__ 1
-+// CHECK_BDVER1_M64: #define __MMX__ 1
-+// CHECK_BDVER1_M64: #define __PCLMUL__ 1
-+// CHECK_BDVER1_M64: #define __POPCNT__ 1
-+// CHECK_BDVER1_M64: #define __PRFCHW__ 1
-+// CHECK_BDVER1_M64: #define __SSE2_MATH__ 1
-+// CHECK_BDVER1_M64: #define __SSE2__ 1
-+// CHECK_BDVER1_M64: #define __SSE3__ 1
-+// CHECK_BDVER1_M64: #define __SSE4A__ 1
-+// CHECK_BDVER1_M64: #define __SSE4_1__ 1
-+// CHECK_BDVER1_M64: #define __SSE4_2__ 1
-+// CHECK_BDVER1_M64: #define __SSE_MATH__ 1
-+// CHECK_BDVER1_M64: #define __SSE__ 1
-+// CHECK_BDVER1_M64: #define __SSSE3__ 1
-+// CHECK_BDVER1_M64: #define __XOP__ 1
-+// CHECK_BDVER1_M64: #define __XSAVE__ 1
-+// CHECK_BDVER1_M64: #define __amd64 1
-+// CHECK_BDVER1_M64: #define __amd64__ 1
-+// CHECK_BDVER1_M64: #define __bdver1 1
-+// CHECK_BDVER1_M64: #define __bdver1__ 1
-+// CHECK_BDVER1_M64: #define __tune_bdver1__ 1
-+// CHECK_BDVER1_M64: #define __x86_64 1
-+// CHECK_BDVER1_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=bdver2 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER2_M32
-+// CHECK_BDVER2_M32-NOT: #define __3dNOW_A__ 1
-+// CHECK_BDVER2_M32-NOT: #define __3dNOW__ 1
-+// CHECK_BDVER2_M32: #define __AES__ 1
-+// CHECK_BDVER2_M32: #define __AVX__ 1
-+// CHECK_BDVER2_M32: #define __BMI__ 1
-+// CHECK_BDVER2_M32: #define __F16C__ 1
-+// CHECK_BDVER2_M32: #define __FMA4__ 1
-+// CHECK_BDVER2_M32: #define __FMA__ 1
-+// CHECK_BDVER2_M32: #define __LWP__ 1
-+// CHECK_BDVER2_M32: #define __LZCNT__ 1
-+// CHECK_BDVER2_M32: #define __MMX__ 1
-+// CHECK_BDVER2_M32: #define __PCLMUL__ 1
-+// CHECK_BDVER2_M32: #define __POPCNT__ 1
-+// CHECK_BDVER2_M32: #define __PRFCHW__ 1
-+// CHECK_BDVER2_M32: #define __SSE2_MATH__ 1
-+// CHECK_BDVER2_M32: #define __SSE2__ 1
-+// CHECK_BDVER2_M32: #define __SSE3__ 1
-+// CHECK_BDVER2_M32: #define __SSE4A__ 1
-+// CHECK_BDVER2_M32: #define __SSE4_1__ 1
-+// CHECK_BDVER2_M32: #define __SSE4_2__ 1
-+// CHECK_BDVER2_M32: #define __SSE_MATH__ 1
-+// CHECK_BDVER2_M32: #define __SSE__ 1
-+// CHECK_BDVER2_M32: #define __SSSE3__ 1
-+// CHECK_BDVER2_M32: #define __TBM__ 1
-+// CHECK_BDVER2_M32: #define __XOP__ 1
-+// CHECK_BDVER2_M32: #define __XSAVE__ 1
-+// CHECK_BDVER2_M32: #define __bdver2 1
-+// CHECK_BDVER2_M32: #define __bdver2__ 1
-+// CHECK_BDVER2_M32: #define __i386 1
-+// CHECK_BDVER2_M32: #define __i386__ 1
-+// CHECK_BDVER2_M32: #define __tune_bdver2__ 1
-+
-+// RUN: %clang -march=bdver2 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER2_M64
-+// CHECK_BDVER2_M64-NOT: #define __3dNOW_A__ 1
-+// CHECK_BDVER2_M64-NOT: #define __3dNOW__ 1
-+// CHECK_BDVER2_M64: #define __AES__ 1
-+// CHECK_BDVER2_M64: #define __AVX__ 1
-+// CHECK_BDVER2_M64: #define __BMI__ 1
-+// CHECK_BDVER2_M64: #define __F16C__ 1
-+// CHECK_BDVER2_M64: #define __FMA4__ 1
-+// CHECK_BDVER2_M64: #define __FMA__ 1
-+// CHECK_BDVER2_M64: #define __LWP__ 1
-+// CHECK_BDVER2_M64: #define __LZCNT__ 1
-+// CHECK_BDVER2_M64: #define __MMX__ 1
-+// CHECK_BDVER2_M64: #define __PCLMUL__ 1
-+// CHECK_BDVER2_M64: #define __POPCNT__ 1
-+// CHECK_BDVER2_M64: #define __PRFCHW__ 1
-+// CHECK_BDVER2_M64: #define __SSE2_MATH__ 1
-+// CHECK_BDVER2_M64: #define __SSE2__ 1
-+// CHECK_BDVER2_M64: #define __SSE3__ 1
-+// CHECK_BDVER2_M64: #define __SSE4A__ 1
-+// CHECK_BDVER2_M64: #define __SSE4_1__ 1
-+// CHECK_BDVER2_M64: #define __SSE4_2__ 1
-+// CHECK_BDVER2_M64: #define __SSE_MATH__ 1
-+// CHECK_BDVER2_M64: #define __SSE__ 1
-+// CHECK_BDVER2_M64: #define __SSSE3__ 1
-+// CHECK_BDVER2_M64: #define __TBM__ 1
-+// CHECK_BDVER2_M64: #define __XOP__ 1
-+// CHECK_BDVER2_M64: #define __XSAVE__ 1
-+// CHECK_BDVER2_M64: #define __amd64 1
-+// CHECK_BDVER2_M64: #define __amd64__ 1
-+// CHECK_BDVER2_M64: #define __bdver2 1
-+// CHECK_BDVER2_M64: #define __bdver2__ 1
-+// CHECK_BDVER2_M64: #define __tune_bdver2__ 1
-+// CHECK_BDVER2_M64: #define __x86_64 1
-+// CHECK_BDVER2_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=bdver3 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER3_M32
-+// CHECK_BDVER3_M32-NOT: #define __3dNOW_A__ 1
-+// CHECK_BDVER3_M32-NOT: #define __3dNOW__ 1
-+// CHECK_BDVER3_M32: #define __AES__ 1
-+// CHECK_BDVER3_M32: #define __AVX__ 1
-+// CHECK_BDVER3_M32: #define __BMI__ 1
-+// CHECK_BDVER3_M32: #define __F16C__ 1
-+// CHECK_BDVER3_M32: #define __FMA4__ 1
-+// CHECK_BDVER3_M32: #define __FMA__ 1
-+// CHECK_BDVER3_M32: #define __FSGSBASE__ 1
-+// CHECK_BDVER3_M32: #define __LWP__ 1
-+// CHECK_BDVER3_M32: #define __LZCNT__ 1
-+// CHECK_BDVER3_M32: #define __MMX__ 1
-+// CHECK_BDVER3_M32: #define __PCLMUL__ 1
-+// CHECK_BDVER3_M32: #define __POPCNT__ 1
-+// CHECK_BDVER3_M32: #define __PRFCHW__ 1
-+// CHECK_BDVER3_M32: #define __SSE2_MATH__ 1
-+// CHECK_BDVER3_M32: #define __SSE2__ 1
-+// CHECK_BDVER3_M32: #define __SSE3__ 1
-+// CHECK_BDVER3_M32: #define __SSE4A__ 1
-+// CHECK_BDVER3_M32: #define __SSE4_1__ 1
-+// CHECK_BDVER3_M32: #define __SSE4_2__ 1
-+// CHECK_BDVER3_M32: #define __SSE_MATH__ 1
-+// CHECK_BDVER3_M32: #define __SSE__ 1
-+// CHECK_BDVER3_M32: #define __SSSE3__ 1
-+// CHECK_BDVER3_M32: #define __TBM__ 1
-+// CHECK_BDVER3_M32: #define __XOP__ 1
-+// CHECK_BDVER3_M32: #define __XSAVEOPT__ 1
-+// CHECK_BDVER3_M32: #define __XSAVE__ 1
-+// CHECK_BDVER3_M32: #define __bdver3 1
-+// CHECK_BDVER3_M32: #define __bdver3__ 1
-+// CHECK_BDVER3_M32: #define __i386 1
-+// CHECK_BDVER3_M32: #define __i386__ 1
-+// CHECK_BDVER3_M32: #define __tune_bdver3__ 1
-+
-+// RUN: %clang -march=bdver3 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER3_M64
-+// CHECK_BDVER3_M64-NOT: #define __3dNOW_A__ 1
-+// CHECK_BDVER3_M64-NOT: #define __3dNOW__ 1
-+// CHECK_BDVER3_M64: #define __AES__ 1
-+// CHECK_BDVER3_M64: #define __AVX__ 1
-+// CHECK_BDVER3_M64: #define __BMI__ 1
-+// CHECK_BDVER3_M64: #define __F16C__ 1
-+// CHECK_BDVER3_M64: #define __FMA4__ 1
-+// CHECK_BDVER3_M64: #define __FMA__ 1
-+// CHECK_BDVER3_M64: #define __FSGSBASE__ 1
-+// CHECK_BDVER3_M64: #define __LWP__ 1
-+// CHECK_BDVER3_M64: #define __LZCNT__ 1
-+// CHECK_BDVER3_M64: #define __MMX__ 1
-+// CHECK_BDVER3_M64: #define __PCLMUL__ 1
-+// CHECK_BDVER3_M64: #define __POPCNT__ 1
-+// CHECK_BDVER3_M64: #define __PRFCHW__ 1
-+// CHECK_BDVER3_M64: #define __SSE2_MATH__ 1
-+// CHECK_BDVER3_M64: #define __SSE2__ 1
-+// CHECK_BDVER3_M64: #define __SSE3__ 1
-+// CHECK_BDVER3_M64: #define __SSE4A__ 1
-+// CHECK_BDVER3_M64: #define __SSE4_1__ 1
-+// CHECK_BDVER3_M64: #define __SSE4_2__ 1
-+// CHECK_BDVER3_M64: #define __SSE_MATH__ 1
-+// CHECK_BDVER3_M64: #define __SSE__ 1
-+// CHECK_BDVER3_M64: #define __SSSE3__ 1
-+// CHECK_BDVER3_M64: #define __TBM__ 1
-+// CHECK_BDVER3_M64: #define __XOP__ 1
-+// CHECK_BDVER3_M64: #define __XSAVEOPT__ 1
-+// CHECK_BDVER3_M64: #define __XSAVE__ 1
-+// CHECK_BDVER3_M64: #define __amd64 1
-+// CHECK_BDVER3_M64: #define __amd64__ 1
-+// CHECK_BDVER3_M64: #define __bdver3 1
-+// CHECK_BDVER3_M64: #define __bdver3__ 1
-+// CHECK_BDVER3_M64: #define __tune_bdver3__ 1
-+// CHECK_BDVER3_M64: #define __x86_64 1
-+// CHECK_BDVER3_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=bdver4 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER4_M32
-+// CHECK_BDVER4_M32-NOT: #define __3dNOW_A__ 1
-+// CHECK_BDVER4_M32-NOT: #define __3dNOW__ 1
-+// CHECK_BDVER4_M32: #define __AES__ 1
-+// CHECK_BDVER4_M32: #define __AVX2__ 1
-+// CHECK_BDVER4_M32: #define __AVX__ 1
-+// CHECK_BDVER4_M32: #define __BMI2__ 1
-+// CHECK_BDVER4_M32: #define __BMI__ 1
-+// CHECK_BDVER4_M32: #define __F16C__ 1
-+// CHECK_BDVER4_M32: #define __FMA4__ 1
-+// CHECK_BDVER4_M32: #define __FMA__ 1
-+// CHECK_BDVER4_M32: #define __FSGSBASE__ 1
-+// CHECK_BDVER4_M32: #define __LWP__ 1
-+// CHECK_BDVER4_M32: #define __LZCNT__ 1
-+// CHECK_BDVER4_M32: #define __MMX__ 1
-+// CHECK_BDVER4_M32: #define __MOVBE__ 1
-+// CHECK_BDVER4_M32: #define __PCLMUL__ 1
-+// CHECK_BDVER4_M32: #define __POPCNT__ 1
-+// CHECK_BDVER4_M32: #define __PRFCHW__ 1
-+// CHECK_BDVER4_M32: #define __RDRND__ 1
-+// CHECK_BDVER4_M32: #define __SSE2_MATH__ 1
-+// CHECK_BDVER4_M32: #define __SSE2__ 1
-+// CHECK_BDVER4_M32: #define __SSE3__ 1
-+// CHECK_BDVER4_M32: #define __SSE4A__ 1
-+// CHECK_BDVER4_M32: #define __SSE4_1__ 1
-+// CHECK_BDVER4_M32: #define __SSE4_2__ 1
-+// CHECK_BDVER4_M32: #define __SSE_MATH__ 1
-+// CHECK_BDVER4_M32: #define __SSE__ 1
-+// CHECK_BDVER4_M32: #define __SSSE3__ 1
-+// CHECK_BDVER4_M32: #define __TBM__ 1
-+// CHECK_BDVER4_M32: #define __XOP__ 1
-+// CHECK_BDVER4_M32: #define __XSAVE__ 1
-+// CHECK_BDVER4_M32: #define __bdver4 1
-+// CHECK_BDVER4_M32: #define __bdver4__ 1
-+// CHECK_BDVER4_M32: #define __i386 1
-+// CHECK_BDVER4_M32: #define __i386__ 1
-+// CHECK_BDVER4_M32: #define __tune_bdver4__ 1
-+
-+// RUN: %clang -march=bdver4 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER4_M64
-+// CHECK_BDVER4_M64-NOT: #define __3dNOW_A__ 1
-+// CHECK_BDVER4_M64-NOT: #define __3dNOW__ 1
-+// CHECK_BDVER4_M64: #define __AES__ 1
-+// CHECK_BDVER4_M64: #define __AVX2__ 1
-+// CHECK_BDVER4_M64: #define __AVX__ 1
-+// CHECK_BDVER4_M64: #define __BMI2__ 1
-+// CHECK_BDVER4_M64: #define __BMI__ 1
-+// CHECK_BDVER4_M64: #define __F16C__ 1
-+// CHECK_BDVER4_M64: #define __FMA4__ 1
-+// CHECK_BDVER4_M64: #define __FMA__ 1
-+// CHECK_BDVER4_M64: #define __FSGSBASE__ 1
-+// CHECK_BDVER4_M64: #define __LWP__ 1
-+// CHECK_BDVER4_M64: #define __LZCNT__ 1
-+// CHECK_BDVER4_M64: #define __MMX__ 1
-+// CHECK_BDVER4_M64: #define __MOVBE__ 1
-+// CHECK_BDVER4_M64: #define __PCLMUL__ 1
-+// CHECK_BDVER4_M64: #define __POPCNT__ 1
-+// CHECK_BDVER4_M64: #define __PRFCHW__ 1
-+// CHECK_BDVER4_M64: #define __RDRND__ 1
-+// CHECK_BDVER4_M64: #define __SSE2_MATH__ 1
-+// CHECK_BDVER4_M64: #define __SSE2__ 1
-+// CHECK_BDVER4_M64: #define __SSE3__ 1
-+// CHECK_BDVER4_M64: #define __SSE4A__ 1
-+// CHECK_BDVER4_M64: #define __SSE4_1__ 1
-+// CHECK_BDVER4_M64: #define __SSE4_2__ 1
-+// CHECK_BDVER4_M64: #define __SSE_MATH__ 1
-+// CHECK_BDVER4_M64: #define __SSE__ 1
-+// CHECK_BDVER4_M64: #define __SSSE3__ 1
-+// CHECK_BDVER4_M64: #define __TBM__ 1
-+// CHECK_BDVER4_M64: #define __XOP__ 1
-+// CHECK_BDVER4_M64: #define __XSAVE__ 1
-+// CHECK_BDVER4_M64: #define __amd64 1
-+// CHECK_BDVER4_M64: #define __amd64__ 1
-+// CHECK_BDVER4_M64: #define __bdver4 1
-+// CHECK_BDVER4_M64: #define __bdver4__ 1
-+// CHECK_BDVER4_M64: #define __tune_bdver4__ 1
-+// CHECK_BDVER4_M64: #define __x86_64 1
-+// CHECK_BDVER4_M64: #define __x86_64__ 1
-+
-+// RUN: %clang -march=znver1 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER1_M32
-+// CHECK_ZNVER1_M32-NOT: #define __3dNOW_A__ 1
-+// CHECK_ZNVER1_M32-NOT: #define __3dNOW__ 1
-+// CHECK_ZNVER1_M32: #define __ADX__ 1
-+// CHECK_ZNVER1_M32: #define __AES__ 1
-+// CHECK_ZNVER1_M32: #define __AVX2__ 1
-+// CHECK_ZNVER1_M32: #define __AVX__ 1
-+// CHECK_ZNVER1_M32: #define __BMI2__ 1
-+// CHECK_ZNVER1_M32: #define __BMI__ 1
-+// CHECK_ZNVER1_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_ZNVER1_M32: #define __CLZERO__ 1
-+// CHECK_ZNVER1_M32: #define __F16C__ 1
-+// CHECK_ZNVER1_M32-NOT: #define __FMA4__ 1
-+// CHECK_ZNVER1_M32: #define __FMA__ 1
-+// CHECK_ZNVER1_M32: #define __FSGSBASE__ 1
-+// CHECK_ZNVER1_M32: #define __LZCNT__ 1
-+// CHECK_ZNVER1_M32: #define __MMX__ 1
-+// CHECK_ZNVER1_M32: #define __MOVBE__ 1
-+// CHECK_ZNVER1_M32: #define __PCLMUL__ 1
-+// CHECK_ZNVER1_M32: #define __POPCNT__ 1
-+// CHECK_ZNVER1_M32: #define __PRFCHW__ 1
-+// CHECK_ZNVER1_M32: #define __RDRND__ 1
-+// CHECK_ZNVER1_M32: #define __RDSEED__ 1
-+// CHECK_ZNVER1_M32: #define __SHA__ 1
-+// CHECK_ZNVER1_M32: #define __SSE2_MATH__ 1
-+// CHECK_ZNVER1_M32: #define __SSE2__ 1
-+// CHECK_ZNVER1_M32: #define __SSE3__ 1
-+// CHECK_ZNVER1_M32: #define __SSE4A__ 1
-+// CHECK_ZNVER1_M32: #define __SSE4_1__ 1
-+// CHECK_ZNVER1_M32: #define __SSE4_2__ 1
-+// CHECK_ZNVER1_M32: #define __SSE_MATH__ 1
-+// CHECK_ZNVER1_M32: #define __SSE__ 1
-+// CHECK_ZNVER1_M32: #define __SSSE3__ 1
-+// CHECK_ZNVER1_M32-NOT: #define __TBM__ 1
-+// CHECK_ZNVER1_M32-NOT: #define __XOP__ 1
-+// CHECK_ZNVER1_M32: #define __XSAVEC__ 1
-+// CHECK_ZNVER1_M32: #define __XSAVEOPT__ 1
-+// CHECK_ZNVER1_M32: #define __XSAVES__ 1
-+// CHECK_ZNVER1_M32: #define __XSAVE__ 1
-+// CHECK_ZNVER1_M32: #define __i386 1
-+// CHECK_ZNVER1_M32: #define __i386__ 1
-+// CHECK_ZNVER1_M32: #define __tune_znver1__ 1
-+// CHECK_ZNVER1_M32: #define __znver1 1
-+// CHECK_ZNVER1_M32: #define __znver1__ 1
-+
-+// RUN: %clang -march=znver1 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER1_M64
-+// CHECK_ZNVER1_M64-NOT: #define __3dNOW_A__ 1
-+// CHECK_ZNVER1_M64-NOT: #define __3dNOW__ 1
-+// CHECK_ZNVER1_M64: #define __ADX__ 1
-+// CHECK_ZNVER1_M64: #define __AES__ 1
-+// CHECK_ZNVER1_M64: #define __AVX2__ 1
-+// CHECK_ZNVER1_M64: #define __AVX__ 1
-+// CHECK_ZNVER1_M64: #define __BMI2__ 1
-+// CHECK_ZNVER1_M64: #define __BMI__ 1
-+// CHECK_ZNVER1_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_ZNVER1_M64: #define __CLZERO__ 1
-+// CHECK_ZNVER1_M64: #define __F16C__ 1
-+// CHECK_ZNVER1_M64-NOT: #define __FMA4__ 1
-+// CHECK_ZNVER1_M64: #define __FMA__ 1
-+// CHECK_ZNVER1_M64: #define __FSGSBASE__ 1
-+// CHECK_ZNVER1_M64: #define __LAHF_SAHF__ 1
-+// CHECK_ZNVER1_M64: #define __LZCNT__ 1
-+// CHECK_ZNVER1_M64: #define __MMX__ 1
-+// CHECK_ZNVER1_M64: #define __MOVBE__ 1
-+// CHECK_ZNVER1_M64: #define __PCLMUL__ 1
-+// CHECK_ZNVER1_M64: #define __POPCNT__ 1
-+// CHECK_ZNVER1_M64: #define __PRFCHW__ 1
-+// CHECK_ZNVER1_M64: #define __RDRND__ 1
-+// CHECK_ZNVER1_M64: #define __RDSEED__ 1
-+// CHECK_ZNVER1_M64: #define __SHA__ 1
-+// CHECK_ZNVER1_M64: #define __SSE2_MATH__ 1
-+// CHECK_ZNVER1_M64: #define __SSE2__ 1
-+// CHECK_ZNVER1_M64: #define __SSE3__ 1
-+// CHECK_ZNVER1_M64: #define __SSE4A__ 1
-+// CHECK_ZNVER1_M64: #define __SSE4_1__ 1
-+// CHECK_ZNVER1_M64: #define __SSE4_2__ 1
-+// CHECK_ZNVER1_M64: #define __SSE_MATH__ 1
-+// CHECK_ZNVER1_M64: #define __SSE__ 1
-+// CHECK_ZNVER1_M64: #define __SSSE3__ 1
-+// CHECK_ZNVER1_M64-NOT: #define __TBM__ 1
-+// CHECK_ZNVER1_M64-NOT: #define __XOP__ 1
-+// CHECK_ZNVER1_M64: #define __XSAVEC__ 1
-+// CHECK_ZNVER1_M64: #define __XSAVEOPT__ 1
-+// CHECK_ZNVER1_M64: #define __XSAVES__ 1
-+// CHECK_ZNVER1_M64: #define __XSAVE__ 1
-+// CHECK_ZNVER1_M64: #define __amd64 1
-+// CHECK_ZNVER1_M64: #define __amd64__ 1
-+// CHECK_ZNVER1_M64: #define __tune_znver1__ 1
-+// CHECK_ZNVER1_M64: #define __x86_64 1
-+// CHECK_ZNVER1_M64: #define __x86_64__ 1
-+// CHECK_ZNVER1_M64: #define __znver1 1
-+// CHECK_ZNVER1_M64: #define __znver1__ 1
-+
-+// RUN: %clang -march=znver2 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER2_M32
-+// CHECK_ZNVER2_M32-NOT: #define __3dNOW_A__ 1
-+// CHECK_ZNVER2_M32-NOT: #define __3dNOW__ 1
-+// CHECK_ZNVER2_M32: #define __ADX__ 1
-+// CHECK_ZNVER2_M32: #define __AES__ 1
-+// CHECK_ZNVER2_M32: #define __AVX2__ 1
-+// CHECK_ZNVER2_M32: #define __AVX__ 1
-+// CHECK_ZNVER2_M32: #define __BMI2__ 1
-+// CHECK_ZNVER2_M32: #define __BMI__ 1
-+// CHECK_ZNVER2_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_ZNVER2_M32: #define __CLWB__ 1
-+// CHECK_ZNVER2_M32: #define __CLZERO__ 1
-+// CHECK_ZNVER2_M32: #define __F16C__ 1
-+// CHECK_ZNVER2_M32-NOT: #define __FMA4__ 1
-+// CHECK_ZNVER2_M32: #define __FMA__ 1
-+// CHECK_ZNVER2_M32: #define __FSGSBASE__ 1
-+// CHECK_ZNVER2_M32: #define __LAHF_SAHF__ 1
-+// CHECK_ZNVER2_M32: #define __LZCNT__ 1
-+// CHECK_ZNVER2_M32: #define __MMX__ 1
-+// CHECK_ZNVER2_M32: #define __PCLMUL__ 1
-+// CHECK_ZNVER2_M32: #define __POPCNT__ 1
-+// CHECK_ZNVER2_M32: #define __PRFCHW__ 1
-+// CHECK_ZNVER2_M32: #define __RDPID__ 1
-+// CHECK_ZNVER2_M32: #define __RDRND__ 1
-+// CHECK_ZNVER2_M32: #define __RDSEED__ 1
-+// CHECK_ZNVER2_M32: #define __SHA__ 1
-+// CHECK_ZNVER2_M32: #define __SSE2_MATH__ 1
-+// CHECK_ZNVER2_M32: #define __SSE2__ 1
-+// CHECK_ZNVER2_M32: #define __SSE3__ 1
-+// CHECK_ZNVER2_M32: #define __SSE4A__ 1
-+// CHECK_ZNVER2_M32: #define __SSE4_1__ 1
-+// CHECK_ZNVER2_M32: #define __SSE4_2__ 1
-+// CHECK_ZNVER2_M32: #define __SSE_MATH__ 1
-+// CHECK_ZNVER2_M32: #define __SSE__ 1
-+// CHECK_ZNVER2_M32: #define __SSSE3__ 1
-+// CHECK_ZNVER2_M32-NOT: #define __TBM__ 1
-+// CHECK_ZNVER2_M32: #define __WBNOINVD__ 1
-+// CHECK_ZNVER2_M32-NOT: #define __XOP__ 1
-+// CHECK_ZNVER2_M32: #define __XSAVEC__ 1
-+// CHECK_ZNVER2_M32: #define __XSAVEOPT__ 1
-+// CHECK_ZNVER2_M32: #define __XSAVES__ 1
-+// CHECK_ZNVER2_M32: #define __XSAVE__ 1
-+// CHECK_ZNVER2_M32: #define __i386 1
-+// CHECK_ZNVER2_M32: #define __i386__ 1
-+// CHECK_ZNVER2_M32: #define __tune_znver2__ 1
-+// CHECK_ZNVER2_M32: #define __znver2 1
-+// CHECK_ZNVER2_M32: #define __znver2__ 1
-+
-+// RUN: %clang -march=znver2 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER2_M64
-+// CHECK_ZNVER2_M64-NOT: #define __3dNOW_A__ 1
-+// CHECK_ZNVER2_M64-NOT: #define __3dNOW__ 1
-+// CHECK_ZNVER2_M64: #define __ADX__ 1
-+// CHECK_ZNVER2_M64: #define __AES__ 1
-+// CHECK_ZNVER2_M64: #define __AVX2__ 1
-+// CHECK_ZNVER2_M64: #define __AVX__ 1
-+// CHECK_ZNVER2_M64: #define __BMI2__ 1
-+// CHECK_ZNVER2_M64: #define __BMI__ 1
-+// CHECK_ZNVER2_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_ZNVER2_M64: #define __CLWB__ 1
-+// CHECK_ZNVER2_M64: #define __CLZERO__ 1
-+// CHECK_ZNVER2_M64: #define __F16C__ 1
-+// CHECK_ZNVER2_M64-NOT: #define __FMA4__ 1
-+// CHECK_ZNVER2_M64: #define __FMA__ 1
-+// CHECK_ZNVER2_M64: #define __FSGSBASE__ 1
-+// CHECK_ZNVER2_M64: #define __LAHF_SAHF__ 1
-+// CHECK_ZNVER2_M64: #define __LZCNT__ 1
-+// CHECK_ZNVER2_M64: #define __MMX__ 1
-+// CHECK_ZNVER2_M64: #define __PCLMUL__ 1
-+// CHECK_ZNVER2_M64: #define __POPCNT__ 1
-+// CHECK_ZNVER2_M64: #define __PRFCHW__ 1
-+// CHECK_ZNVER2_M64: #define __RDPID__ 1
-+// CHECK_ZNVER2_M64: #define __RDRND__ 1
-+// CHECK_ZNVER2_M64: #define __RDSEED__ 1
-+// CHECK_ZNVER2_M64: #define __SHA__ 1
-+// CHECK_ZNVER2_M64: #define __SSE2_MATH__ 1
-+// CHECK_ZNVER2_M64: #define __SSE2__ 1
-+// CHECK_ZNVER2_M64: #define __SSE3__ 1
-+// CHECK_ZNVER2_M64: #define __SSE4A__ 1
-+// CHECK_ZNVER2_M64: #define __SSE4_1__ 1
-+// CHECK_ZNVER2_M64: #define __SSE4_2__ 1
-+// CHECK_ZNVER2_M64: #define __SSE_MATH__ 1
-+// CHECK_ZNVER2_M64: #define __SSE__ 1
-+// CHECK_ZNVER2_M64: #define __SSSE3__ 1
-+// CHECK_ZNVER2_M64-NOT: #define __TBM__ 1
-+// CHECK_ZNVER2_M64: #define __WBNOINVD__ 1
-+// CHECK_ZNVER2_M64-NOT: #define __XOP__ 1
-+// CHECK_ZNVER2_M64: #define __XSAVEC__ 1
-+// CHECK_ZNVER2_M64: #define __XSAVEOPT__ 1
-+// CHECK_ZNVER2_M64: #define __XSAVES__ 1
-+// CHECK_ZNVER2_M64: #define __XSAVE__ 1
-+// CHECK_ZNVER2_M64: #define __amd64 1
-+// CHECK_ZNVER2_M64: #define __amd64__ 1
-+// CHECK_ZNVER2_M64: #define __tune_znver2__ 1
-+// CHECK_ZNVER2_M64: #define __x86_64 1
-+// CHECK_ZNVER2_M64: #define __x86_64__ 1
-+// CHECK_ZNVER2_M64: #define __znver2 1
-+// CHECK_ZNVER2_M64: #define __znver2__ 1
-+
-+// RUN: %clang -march=znver3 -m32 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER3_M32
-+// CHECK_ZNVER3_M32-NOT: #define __3dNOW_A__ 1
-+// CHECK_ZNVER3_M32-NOT: #define __3dNOW__ 1
-+// CHECK_ZNVER3_M32: #define __ADX__ 1
-+// CHECK_ZNVER3_M32: #define __AES__ 1
-+// CHECK_ZNVER3_M32: #define __AVX2__ 1
-+// CHECK_ZNVER3_M32: #define __AVX__ 1
-+// CHECK_ZNVER3_M32: #define __BMI2__ 1
-+// CHECK_ZNVER3_M32: #define __BMI__ 1
-+// CHECK_ZNVER3_M32: #define __CLFLUSHOPT__ 1
-+// CHECK_ZNVER3_M32: #define __CLWB__ 1
-+// CHECK_ZNVER3_M32: #define __CLZERO__ 1
-+// CHECK_ZNVER3_M32: #define __F16C__ 1
-+// CHECK_ZNVER3_M32-NOT: #define __FMA4__ 1
-+// CHECK_ZNVER3_M32: #define __FMA__ 1
-+// CHECK_ZNVER3_M32: #define __FSGSBASE__ 1
-+// CHECK_ZNVER3_M32: #define __LZCNT__ 1
-+// CHECK_ZNVER3_M32: #define __MMX__ 1
-+// CHECK_ZNVER3_M32: #define __PCLMUL__ 1
-+// CHECK_ZNVER3_M32: #define __PKU__ 1
-+// CHECK_ZNVER3_M32: #define __POPCNT__ 1
-+// CHECK_ZNVER3_M32: #define __PRFCHW__ 1
-+// CHECK_ZNVER3_M32: #define __RDPID__ 1
-+// CHECK_ZNVER3_M32: #define __RDRND__ 1
-+// CHECK_ZNVER3_M32: #define __RDSEED__ 1
-+// CHECK_ZNVER3_M32: #define __SHA__ 1
-+// CHECK_ZNVER3_M32: #define __SSE2_MATH__ 1
-+// CHECK_ZNVER3_M32: #define __SSE2__ 1
-+// CHECK_ZNVER3_M32: #define __SSE3__ 1
-+// CHECK_ZNVER3_M32: #define __SSE4A__ 1
-+// CHECK_ZNVER3_M32: #define __SSE4_1__ 1
-+// CHECK_ZNVER3_M32: #define __SSE4_2__ 1
-+// CHECK_ZNVER3_M32: #define __SSE_MATH__ 1
-+// CHECK_ZNVER3_M32: #define __SSE__ 1
-+// CHECK_ZNVER3_M32: #define __SSSE3__ 1
-+// CHECK_ZNVER3_M32-NOT: #define __TBM__ 1
-+// CHECK_ZNVER3_M32: #define __WBNOINVD__ 1
-+// CHECK_ZNVER3_M32-NOT: #define __XOP__ 1
-+// CHECK_ZNVER3_M32: #define __XSAVEC__ 1
-+// CHECK_ZNVER3_M32: #define __XSAVEOPT__ 1
-+// CHECK_ZNVER3_M32: #define __XSAVES__ 1
-+// CHECK_ZNVER3_M32: #define __XSAVE__ 1
-+// CHECK_ZNVER3_M32: #define __i386 1
-+// CHECK_ZNVER3_M32: #define __i386__ 1
-+// CHECK_ZNVER3_M32: #define __tune_znver3__ 1
-+// CHECK_ZNVER3_M32: #define __znver3 1
-+// CHECK_ZNVER3_M32: #define __znver3__ 1
-+
-+// RUN: %clang -march=znver3 -m64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target i386-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER3_M64
-+// CHECK_ZNVER3_M64-NOT: #define __3dNOW_A__ 1
-+// CHECK_ZNVER3_M64-NOT: #define __3dNOW__ 1
-+// CHECK_ZNVER3_M64: #define __ADX__ 1
-+// CHECK_ZNVER3_M64: #define __AES__ 1
-+// CHECK_ZNVER3_M64: #define __AVX2__ 1
-+// CHECK_ZNVER3_M64: #define __AVX__ 1
-+// CHECK_ZNVER3_M64: #define __BMI2__ 1
-+// CHECK_ZNVER3_M64: #define __BMI__ 1
-+// CHECK_ZNVER3_M64: #define __CLFLUSHOPT__ 1
-+// CHECK_ZNVER3_M64: #define __CLWB__ 1
-+// CHECK_ZNVER3_M64: #define __CLZERO__ 1
-+// CHECK_ZNVER3_M64: #define __F16C__ 1
-+// CHECK_ZNVER3_M64-NOT: #define __FMA4__ 1
-+// CHECK_ZNVER3_M64: #define __FMA__ 1
-+// CHECK_ZNVER3_M64: #define __FSGSBASE__ 1
-+// CHECK_ZNVER3_M64: #define __LZCNT__ 1
-+// CHECK_ZNVER3_M64: #define __MMX__ 1
-+// CHECK_ZNVER3_M64: #define __PCLMUL__ 1
-+// CHECK_ZNVER3_M64: #define __PKU__ 1
-+// CHECK_ZNVER3_M64: #define __POPCNT__ 1
-+// CHECK_ZNVER3_M64: #define __PRFCHW__ 1
-+// CHECK_ZNVER3_M64: #define __RDPID__ 1
-+// CHECK_ZNVER3_M64: #define __RDRND__ 1
-+// CHECK_ZNVER3_M64: #define __RDSEED__ 1
-+// CHECK_ZNVER3_M64: #define __SHA__ 1
-+// CHECK_ZNVER3_M64: #define __SSE2_MATH__ 1
-+// CHECK_ZNVER3_M64: #define __SSE2__ 1
-+// CHECK_ZNVER3_M64: #define __SSE3__ 1
-+// CHECK_ZNVER3_M64: #define __SSE4A__ 1
-+// CHECK_ZNVER3_M64: #define __SSE4_1__ 1
-+// CHECK_ZNVER3_M64: #define __SSE4_2__ 1
-+// CHECK_ZNVER3_M64: #define __SSE_MATH__ 1
-+// CHECK_ZNVER3_M64: #define __SSE__ 1
-+// CHECK_ZNVER3_M64: #define __SSSE3__ 1
-+// CHECK_ZNVER3_M64-NOT: #define __TBM__ 1
-+// CHECK_ZNVER3_M64: #define __VAES__ 1
-+// CHECK_ZNVER3_M64: #define __VPCLMULQDQ__ 1
-+// CHECK_ZNVER3_M64: #define __WBNOINVD__ 1
-+// CHECK_ZNVER3_M64-NOT: #define __XOP__ 1
-+// CHECK_ZNVER3_M64: #define __XSAVEC__ 1
-+// CHECK_ZNVER3_M64: #define __XSAVEOPT__ 1
-+// CHECK_ZNVER3_M64: #define __XSAVES__ 1
-+// CHECK_ZNVER3_M64: #define __XSAVE__ 1
-+// CHECK_ZNVER3_M64: #define __amd64 1
-+// CHECK_ZNVER3_M64: #define __amd64__ 1
-+// CHECK_ZNVER3_M64: #define __tune_znver3__ 1
-+// CHECK_ZNVER3_M64: #define __x86_64 1
-+// CHECK_ZNVER3_M64: #define __x86_64__ 1
-+// CHECK_ZNVER3_M64: #define __znver3 1
-+// CHECK_ZNVER3_M64: #define __znver3__ 1
-+
-+// End X86/GCC/Linux tests ------------------
-+
-+// Begin PPC/GCC/Linux tests ----------------
-+// Check that VSX also turns on altivec.
-+// RUN: %clang -mvsx -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_VSX_M32
-+// CHECK_PPC_VSX_M32: #define __ALTIVEC__ 1
-+// CHECK_PPC_VSX_M32: #define __VSX__ 1
-+
-+// RUN: %clang -mvsx -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_VSX_M64
-+// CHECK_PPC_VSX_M64: #define __VSX__ 1
-+
-+// RUN: %clang -mpower8-vector -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_POWER8_VECTOR_M64
-+// CHECK_PPC_POWER8_VECTOR_M64: #define __POWER8_VECTOR__ 1
-+
-+// RUN: %clang -mpower9-vector -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_POWER9_VECTOR_M64
-+// CHECK_PPC_POWER9_VECTOR_M64: #define __POWER9_VECTOR__ 1
-+
-+// RUN: %clang -mcrypto -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_CRYPTO_M64
-+// CHECK_PPC_CRYPTO_M64: #define __CRYPTO__ 1
-+
-+// HTM is available on power8 or later which includes all of powerpc64le as an
-+// ABI choice. Test that, the cpus, and the option.
-+// RUN: %clang -mhtm -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_HTM
-+// RUN: %clang -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64le-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_HTM
-+// RUN: %clang -mcpu=pwr8 -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_HTM
-+// RUN: %clang -mcpu=pwr9 -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_HTM
-+// CHECK_PPC_HTM: #define __HTM__ 1
-+
-+// RUN: %clang -mcpu=ppc64 -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64-unknown-unknown \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_GCC_ATOMICS
-+// RUN: %clang -mcpu=pwr8 -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64-unknown-unknown \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_GCC_ATOMICS
-+// RUN: %clang -E -dM %s -o - 2>&1 \
-+// RUN:     -target powerpc64le-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_GCC_ATOMICS
-+// CHECK_PPC_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_PPC_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_PPC_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_PPC_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+
-+// End PPC/GCC/Linux tests ------------------
-+
-+// Begin Sparc/GCC/Linux tests ----------------
-+
-+// RUN: %clang -E -dM %s -o - 2>&1 \
-+// RUN:     -target sparc-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARC
-+// CHECK_SPARC: #define __BIG_ENDIAN__ 1
-+// CHECK_SPARC: #define __sparc 1
-+// CHECK_SPARC: #define __sparc__ 1
-+// CHECK_SPARC-NOT: #define __sparcv9 1
-+// CHECK_SPARC-NOT: #define __sparcv9__ 1
-+// CHECK_SPARC: #define __sparcv8 1
-+// CHECK_SPARC-NOT: #define __sparcv9 1
-+// CHECK_SPARC-NOT: #define __sparcv9__ 1
-+
-+// RUN: %clang -mcpu=v9 -E -dM %s -o - 2>&1 \
-+// RUN:     -target sparc-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARC-V9
-+// CHECK_SPARC-V9-NOT: #define __sparcv8 1
-+// CHECK_SPARC-V9-NOT: #define __sparcv8__ 1
-+// CHECK_SPARC-V9: #define __sparc_v9__ 1
-+// CHECK_SPARC-V9: #define __sparcv9 1
-+// CHECK_SPARC-V9: #define __sparcv9__ 1
-+
-+// RUN: %clang -E -dM %s -o - 2>&1 \
-+// RUN:     -target sparc-sun-solaris \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARC_SOLARIS_GCC_ATOMICS
-+// CHECK_SPARC_SOLARIS_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_SPARC_SOLARIS_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_SPARC_SOLARIS_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_SPARC_SOLARIS_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+
-+// RUN: %clang -mcpu=v8 -E -dM %s -o - 2>&1 \
-+// RUN:     -target sparc-sun-solaris \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8
-+// CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8-NOT: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8-NOT: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8-NOT: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8-NOT: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+
-+// RUN: %clang -E -dM %s -o - 2>&1 \
-+// RUN:     -target sparcel-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARCEL
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2.1 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-1 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2.2 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2.3 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2100 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-1 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2150 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2155 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2450 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2455 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2x5x 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2080 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2085 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2480 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2485 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2x8x 2>&1 \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-+// RUN:     -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-+// CHECK_SPARCEL: #define __LITTLE_ENDIAN__ 1
-+// CHECK_MYRIAD2: #define __leon__ 1
-+// CHECK_MYRIAD2-1: #define __myriad2 1
-+// CHECK_MYRIAD2-1: #define __myriad2__ 1
-+// CHECK_MYRIAD2-2: #define __ma2x5x 1
-+// CHECK_MYRIAD2-2: #define __ma2x5x__ 1
-+// CHECK_MYRIAD2-2: #define __myriad2 2
-+// CHECK_MYRIAD2-2: #define __myriad2__ 2
-+// CHECK_MYRIAD2-3: #define __ma2x8x 1
-+// CHECK_MYRIAD2-3: #define __ma2x8x__ 1
-+// CHECK_MYRIAD2-3: #define __myriad2 3
-+// CHECK_MYRIAD2-3: #define __myriad2__ 3
-+// CHECK_SPARCEL: #define __sparc 1
-+// CHECK_SPARCEL: #define __sparc__ 1
-+// CHECK_MYRIAD2: #define __sparc_v8__ 1
-+// CHECK_SPARCEL: #define __sparcv8 1
-+
-+// RUN: %clang -E -dM %s -o - 2>&1 \
-+// RUN:     -target sparcv9-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARCV9
-+// CHECK_SPARCV9: #define __BIG_ENDIAN__ 1
-+// CHECK_SPARCV9: #define __sparc 1
-+// CHECK_SPARCV9: #define __sparc64__ 1
-+// CHECK_SPARCV9: #define __sparc__ 1
-+// CHECK_SPARCV9: #define __sparc_v9__ 1
-+// CHECK_SPARCV9: #define __sparcv9 1
-+// CHECK_SPARCV9: #define __sparcv9__ 1
-+
-+// RUN: %clang -E -dM %s -o - 2>&1 \
-+// RUN:     -target sparcv9-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARCV9_GCC_ATOMICS
-+// CHECK_SPARCV9_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_SPARCV9_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_SPARCV9_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_SPARCV9_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+
-+// Begin SystemZ/GCC/Linux tests ----------------
-+
-+// RUN: %clang -march=arch8 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH8
-+// RUN: %clang -march=z10 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH8
-+// CHECK_SYSTEMZ_ARCH8: #define __ARCH__ 8
-+// CHECK_SYSTEMZ_ARCH8: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_SYSTEMZ_ARCH8: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_SYSTEMZ_ARCH8: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_SYSTEMZ_ARCH8: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+// CHECK_SYSTEMZ_ARCH8: #define __LONG_DOUBLE_128__ 1
-+// CHECK_SYSTEMZ_ARCH8: #define __s390__ 1
-+// CHECK_SYSTEMZ_ARCH8: #define __s390x__ 1
-+// CHECK_SYSTEMZ_ARCH8: #define __zarch__ 1
-+
-+// RUN: %clang -march=arch9 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH9
-+// RUN: %clang -march=z196 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH9
-+// CHECK_SYSTEMZ_ARCH9: #define __ARCH__ 9
-+// CHECK_SYSTEMZ_ARCH9: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_SYSTEMZ_ARCH9: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_SYSTEMZ_ARCH9: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_SYSTEMZ_ARCH9: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+// CHECK_SYSTEMZ_ARCH9: #define __LONG_DOUBLE_128__ 1
-+// CHECK_SYSTEMZ_ARCH9: #define __s390__ 1
-+// CHECK_SYSTEMZ_ARCH9: #define __s390x__ 1
-+// CHECK_SYSTEMZ_ARCH9: #define __zarch__ 1
-+
-+// RUN: %clang -march=arch10 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH10
-+// RUN: %clang -march=zEC12 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH10
-+// CHECK_SYSTEMZ_ARCH10: #define __ARCH__ 10
-+// CHECK_SYSTEMZ_ARCH10: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_SYSTEMZ_ARCH10: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_SYSTEMZ_ARCH10: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_SYSTEMZ_ARCH10: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+// CHECK_SYSTEMZ_ARCH10: #define __HTM__ 1
-+// CHECK_SYSTEMZ_ARCH10: #define __LONG_DOUBLE_128__ 1
-+// CHECK_SYSTEMZ_ARCH10: #define __s390__ 1
-+// CHECK_SYSTEMZ_ARCH10: #define __s390x__ 1
-+// CHECK_SYSTEMZ_ARCH10: #define __zarch__ 1
-+
-+// RUN: %clang -march=arch11 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH11
-+// RUN: %clang -march=z13 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH11
-+// CHECK_SYSTEMZ_ARCH11: #define __ARCH__ 11
-+// CHECK_SYSTEMZ_ARCH11: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_SYSTEMZ_ARCH11: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_SYSTEMZ_ARCH11: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_SYSTEMZ_ARCH11: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+// CHECK_SYSTEMZ_ARCH11: #define __HTM__ 1
-+// CHECK_SYSTEMZ_ARCH11: #define __LONG_DOUBLE_128__ 1
-+// CHECK_SYSTEMZ_ARCH11: #define __VX__ 1
-+// CHECK_SYSTEMZ_ARCH11: #define __s390__ 1
-+// CHECK_SYSTEMZ_ARCH11: #define __s390x__ 1
-+// CHECK_SYSTEMZ_ARCH11: #define __zarch__ 1
-+
-+// RUN: %clang -march=arch12 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH12
-+// RUN: %clang -march=z14 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH12
-+// CHECK_SYSTEMZ_ARCH12: #define __ARCH__ 12
-+// CHECK_SYSTEMZ_ARCH12: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_SYSTEMZ_ARCH12: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_SYSTEMZ_ARCH12: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_SYSTEMZ_ARCH12: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+// CHECK_SYSTEMZ_ARCH12: #define __HTM__ 1
-+// CHECK_SYSTEMZ_ARCH12: #define __LONG_DOUBLE_128__ 1
-+// CHECK_SYSTEMZ_ARCH12: #define __VX__ 1
-+// CHECK_SYSTEMZ_ARCH12: #define __s390__ 1
-+// CHECK_SYSTEMZ_ARCH12: #define __s390x__ 1
-+// CHECK_SYSTEMZ_ARCH12: #define __zarch__ 1
-+
-+// RUN: %clang -march=arch13 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH13
-+// RUN: %clang -march=z15 -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH13
-+// CHECK_SYSTEMZ_ARCH13: #define __ARCH__ 13
-+// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-+// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-+// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-+// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-+// CHECK_SYSTEMZ_ARCH13: #define __HTM__ 1
-+// CHECK_SYSTEMZ_ARCH13: #define __LONG_DOUBLE_128__ 1
-+// CHECK_SYSTEMZ_ARCH13: #define __VX__ 1
-+// CHECK_SYSTEMZ_ARCH13: #define __s390__ 1
-+// CHECK_SYSTEMZ_ARCH13: #define __s390x__ 1
-+// CHECK_SYSTEMZ_ARCH13: #define __zarch__ 1
-+
-+// RUN: %clang -mhtm -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_HTM
-+// CHECK_SYSTEMZ_HTM: #define __HTM__ 1
-+
-+// RUN: %clang -mvx -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_VX
-+// CHECK_SYSTEMZ_VX: #define __VX__ 1
-+
-+// RUN: %clang -fzvector -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ZVECTOR
-+// RUN: %clang -mzvector -E -dM %s -o - 2>&1 \
-+// RUN:     -target s390x-unknown-linux \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ZVECTOR
-+// CHECK_SYSTEMZ_ZVECTOR: #define __VEC__ 10303
-+
-+// Begin amdgcn tests ----------------
-+
-+// RUN: %clang -march=amdgcn -E -dM %s -o - 2>&1 \
-+// RUN:     -target amdgcn-unknown-unknown \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_AMDGCN
-+// CHECK_AMDGCN: #define __AMDGCN__ 1
-+// CHECK_AMDGCN: #define __HAS_FMAF__ 1
-+// CHECK_AMDGCN: #define __HAS_FP64__ 1
-+// CHECK_AMDGCN: #define __HAS_LDEXPF__ 1
-+
-+// Begin r600 tests ----------------
-+
-+// RUN: %clang -march=amdgcn -E -dM %s -o - 2>&1 \
-+// RUN:     -target r600-unknown-unknown \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_R600
-+// CHECK_R600: #define __R600__ 1
-+// CHECK_R600-NOT: #define __HAS_FMAF__ 1
-+
-+// RUN: %clang -march=amdgcn -mcpu=cypress -E -dM %s -o - 2>&1 \
-+// RUN:     -target r600-unknown-unknown \
-+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_R600_FP64
-+// CHECK_R600_FP64-DAG: #define __R600__ 1
-+// CHECK_R600_FP64-DAG: #define __HAS_FMAF__ 1
diff --git a/debian/patches/sparc/sparc-D98575-compiler-rt.patch b/debian/patches/sparc/sparc-D98575-compiler-rt.patch
deleted file mode 100644
index f794a107..00000000
--- a/debian/patches/sparc/sparc-D98575-compiler-rt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- llvm-toolchain-12-12.0.1~+rc1.orig/compiler-rt/cmake/base-config-ix.cmake
-+++ llvm-toolchain-12-12.0.1~+rc1/compiler-rt/cmake/base-config-ix.cmake
-@@ -189,8 +189,12 @@ macro(test_targets)
-     elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "s390x")
-       test_target_arch(s390x "" "")
-     elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "sparc")
--      test_target_arch(sparc "" "-m32")
--      test_target_arch(sparcv9 "" "-m64")
-+      if (CMAKE_SIZEOF_VOID_P EQUAL 4)
-+        test_target_arch(sparc "" "-mcpu=v9" "-m32")
-+        append("-latomic" CMAKE_LD_FLAGS)
-+      else()
-+        test_target_arch(sparcv9 "" "-m64")
-+      endif()
-     elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "mipsel|mips64el")
-       # Gcc doesn't accept -m32/-m64 so we do the next best thing and use
-       # -mips32r2/-mips64r2. We don't use -mips1/-mips3 because we want to match

From 84f2134e5c239527894af8c17c4fe7cbddbf99a8 Mon Sep 17 00:00:00 2001
From: Faidon Liambotis <paravoid@debian.org>
Date: Fri, 5 Jan 2024 17:54:20 +0200
Subject: [PATCH 271/349] Mark documentation packages as Multi-Arch: foreign

..and convert clang-*-examples from Architecture: any -> all.

Identified by the multiarch hinter:
  * clang-17-examples could be converted to Architecture: all and marked Multi-Arch: foreign
  * clang-17-doc could be marked Multi-Arch: foreign
  * libomp-17-doc could be marked Multi-Arch: foreign
  * llvm-17-doc could be marked Multi-Arch: foreign
---
 debian/control    | 6 +++++-
 debian/control.in | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index b58c452d..4981ee00 100644
--- a/debian/control
+++ b/debian/control
@@ -116,6 +116,7 @@ Description: Language server that provides IDE-like features to editors
 
 Package: clang-17-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax
 Description: C, C++ and Objective-C compiler - Documentation
@@ -314,7 +315,8 @@ Description: Clang Python Bindings
  This binding package provides access to the Clang compiler and libraries.
 
 Package: clang-17-examples
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Clang examples
@@ -470,6 +472,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings
 Package: llvm-17-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
 Description: Modular compiler and toolchain technologies, documentation
  LLVM is a collection of libraries and tools that make it easy to build
@@ -637,6 +640,7 @@ Description: LLVM OpenMP runtime
 Package: libomp-17-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
 Replaces: libiomp-x.y-doc
 Breaks: libiomp-x.y-doc
diff --git a/debian/control.in b/debian/control.in
index f83a0c73..f333faab 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -116,6 +116,7 @@ Description: Language server that provides IDE-like features to editors
 
 Package: clang-@LLVM_VERSION@-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax
 Description: C, C++ and Objective-C compiler - Documentation
@@ -314,7 +315,8 @@ Description: Clang Python Bindings
  This binding package provides access to the Clang compiler and libraries.
 
 Package: clang-@LLVM_VERSION@-examples
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Clang examples
@@ -470,6 +472,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings
 Package: llvm-@LLVM_VERSION@-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
 Description: Modular compiler and toolchain technologies, documentation
  LLVM is a collection of libraries and tools that make it easy to build
@@ -637,6 +640,7 @@ Description: LLVM OpenMP runtime
 Package: libomp-@LLVM_VERSION@-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
 Replaces: libiomp-x.y-doc
 Breaks: libiomp-x.y-doc

From c7d388292fd1afd9ce77c8ad766ecfd3c3b9baa6 Mon Sep 17 00:00:00 2001
From: Faidon Liambotis <paravoid@debian.org>
Date: Fri, 5 Jan 2024 18:05:11 +0200
Subject: [PATCH 272/349] Convert libclang-common-*-dev to Arch: all/M-A:
 foreign

libclang-common-*-dev is an Architecture: any package, possibly due to
the fact that it contained compiler-rt before it was split off to a
separate package. It is not marked as Multi-Arch: same, despite the
hinter suggesting to do so, presumably due to identical files.

Convert it to Architecture: all / Multi-Arch: foreign instead. This
requires the removal of the arch: any dependency libllvm17, which is
spurious anyway. However, for extra safety, add version specifiers to
other packages that do depend on (an unversioned) libllvm17, such as
clang.
---
 debian/control    | 17 +++++++++++------
 debian/control.in | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index b58c452d..e06a0142 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,9 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17
 Package: clang-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-17-dev (= ${binary:Version}),
+ ${dep:devlibs-objc},
+ libllvm17 (= ${binary:Version}),
+ libclang-common-17-dev (= ${source:Version}),
  llvm-17-linker-tools (= ${binary:Version}),
  libclang1-17 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -92,7 +94,8 @@ Description: Tool to format C/C++/Obj-C code
 Package: clang-tidy-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm17 (= ${binary:Version}), libclang-common-17-dev,
+ libllvm17 (= ${binary:Version}),
+ libclang-common-17-dev (= ${source:Version}),
  clang-tools-17, python3-yaml
 Description: clang-based C++ linter tool
  Provide an extensible framework for diagnosing and fixing typical programming
@@ -103,7 +106,8 @@ Description: clang-based C++ linter tool
 Package: clangd-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libclang-common-17-dev (= ${binary:Version})
+ libllvm17 (= ${binary:Version}),
+ libclang-common-17-dev (= ${source:Version}),
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
   - code completion
@@ -154,7 +158,7 @@ Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang1-17 (= ${binary:Version}),
- libclang-common-17-dev (= ${binary:Version})
+ libclang-common-17-dev (= ${source:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -167,9 +171,10 @@ Description: Clang library - Development package
  libclang1-17.
 
 Package: libclang-common-17-dev
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
 Recommends: libclang-rt-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
diff --git a/debian/control.in b/debian/control.in
index f83a0c73..f86e194e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -44,7 +44,9 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_
 Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
+ ${dep:devlibs-objc},
+ libllvm@LLVM_VERSION@ (= ${binary:Version}),
+ libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
  libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -92,7 +94,8 @@ Description: Tool to format C/C++/Obj-C code
 Package: clang-tidy-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm@LLVM_VERSION@ (= ${binary:Version}), libclang-common-@LLVM_VERSION@-dev,
+ libllvm@LLVM_VERSION@ (= ${binary:Version}),
+ libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
  clang-tools-@LLVM_VERSION@, python3-yaml
 Description: clang-based C++ linter tool
  Provide an extensible framework for diagnosing and fixing typical programming
@@ -103,7 +106,8 @@ Description: clang-based C++ linter tool
 Package: clangd-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
+ libllvm@LLVM_VERSION@ (= ${binary:Version}),
+ libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
   - code completion
@@ -154,7 +158,7 @@ Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@ (= ${binary:Version}),
- libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
+ libclang-common-@LLVM_VERSION@-dev (= ${source:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -167,9 +171,10 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
 Recommends: libclang-rt-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end

From f463aa4e2351ec64bcde50d9ac0175b227cf3348 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 15 Dec 2023 18:53:06 +0100
Subject: [PATCH 273/349] Cherry pick the wasm fix from 16 (Closes: #1057838)

---
 debian/changelog                          | 14 ++++--
 debian/patches/wasm/wasm-sysroot-usr.diff | 57 +++++++++++++----------
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd9d2af8..07eead8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-llvm-toolchain-17 (1:17.0.6-3) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-4) UNRELEASED; urgency=medium
 
-  * libclang1-17: Remove the full version symlinks.
+ [ Matthias Klose ]
+ * libclang1-17: Remove the full version symlinks.
 
- -- Matthias Klose <doko@debian.org>  Mon, 11 Dec 2023 22:54:48 +0100
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 09 Jan 2024 09:42:35 +0100
+
+llvm-toolchain-17 (1:17.0.6-3) unstable; urgency=medium
+
+  * Cherry pick the wasm fix from 16
+    (Closes: #1057838)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 15 Dec 2023 18:51:57 +0100
 
 llvm-toolchain-17 (1:17.0.6-2) unstable; urgency=medium
 
diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff
index 46342231..b3bbf565 100644
--- a/debian/patches/wasm/wasm-sysroot-usr.diff
+++ b/debian/patches/wasm/wasm-sysroot-usr.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.cpp
+Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.cpp
+--- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
++++ llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
 @@ -174,7 +174,7 @@ WebAssembly::WebAssembly(const Driver &D
  
    getProgramPaths().push_back(getDriver().getInstalledDir());
@@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver
  
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
      SmallString<128> P(D.ResourceDir);
-@@ -425,12 +426,29 @@ void WebAssembly::AddClangSystemIncludeA
+@@ -425,12 +426,20 @@ void WebAssembly::AddClangSystemIncludeA
      return;
    }
  
@@ -28,22 +28,12 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver
      const std::string MultiarchTriple =
 -        getMultiarchTriple(D, getTriple(), D.SysRoot);
 -    addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include/" + MultiarchTriple);
--  }
--  addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
 +        getMultiarchTriple(D, getTriple(), SysRoot);
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/local/include/" + MultiarchTriple);
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/local/include");
 +    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/include/" + MultiarchTriple);
-+	std::string LibPath = SysRoot	+ "/include";
-+	std::string Version = detectLibcxxVersion(LibPath);
-+
-+	if (!getDriver().SysRoot.empty()) {
-+		// Second add the generic one.
-+		addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
-+		// Third the backward one.
-+		addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
-+	}
-+  }
+   }
+-  addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
 +
 +  // also add the non-multiarch path, only on a known OS (as above), or when
 +  // a sysroot is given, for backwards compatibility with the original driver
@@ -53,7 +43,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver
  }
  
  void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
-@@ -481,6 +490,17 @@ Tool *WebAssembly::buildLinker() const {
+@@ -478,6 +487,17 @@ Tool *WebAssembly::buildLinker() const {
    return new tools::wasm::Linker(*this);
  }
  
@@ -71,18 +61,37 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver
  void WebAssembly::addLibCxxIncludePaths(
      const llvm::opt::ArgList &DriverArgs,
      llvm::opt::ArgStringList &CC1Args) const {
-@@ -502,7 +522,9 @@ void WebAssembly::addLibCxxIncludePaths(
+@@ -488,18 +508,22 @@ void WebAssembly::addLibCxxIncludePaths(
+       getMultiarchTriple(D, getTriple(), SysRoot);
+   bool IsKnownOs = (getTriple().getOS() != llvm::Triple::UnknownOS);
+ 
+-  std::string Version = detectLibcxxVersion(LibPath);
+-  if (Version.empty())
+-    return;
+-
+   // First add the per-target include path if the OS is known.
+   if (IsKnownOs) {
+-    std::string TargetDir = LibPath + "/" + MultiarchTriple + "/c++/" + Version;
+-    addSystemInclude(DriverArgs, CC1Args, TargetDir);
++    std::string Version = detectLibcxxVersion(LibPath + "/" + MultiarchTriple);
++    if (!Version.empty()) {
++      std::string TargetDir = LibPath + "/" + MultiarchTriple + "/c++/" + Version;
++      addSystemInclude(DriverArgs, CC1Args, TargetDir);
++    }
    }
  
    // Second add the generic one.
 -  addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
 +  // don't include the host architecture's headers in the search path
-+  if (!getDriver().SysRoot.empty())
-+    addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
++  if (!getDriver().SysRoot.empty()) {
++    std::string Version = detectLibcxxVersion(LibPath);
++    if (!Version.empty())
++      addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
++  }
  }
  
  void WebAssembly::addLibStdCXXIncludePaths(
-@@ -549,8 +571,11 @@ void WebAssembly::addLibStdCXXIncludePat
+@@ -546,8 +570,11 @@ void WebAssembly::addLibStdCXXIncludePat
      addSystemInclude(DriverArgs, CC1Args, TargetDir);
    }
  
@@ -98,10 +107,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver
 +    addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
 +  }
  }
-Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.h
+Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.h
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/lib/Driver/ToolChains/WebAssembly.h
-+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.h
+--- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.h
++++ llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.h
 @@ -89,6 +89,8 @@ private:
                               llvm::opt::ArgStringList &CC1Args) const;
    void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs,

From 0c176de6acde249bea81c2ac85f8acb4c6ad1671 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 9 Jan 2024 09:45:59 +0100
Subject: [PATCH 274/349] prepare upload

---
 debian/changelog | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 07eead8e..3604c3b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-llvm-toolchain-17 (1:17.0.6-4) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-4) unstable; urgency=medium
 
  [ Matthias Klose ]
  * libclang1-17: Remove the full version symlinks.
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 09 Jan 2024 09:42:35 +0100
+  [ Faidon Liambotis ]
+  * Enable COMPILER_RT_DEFAULT_TARGET_ONLY for all archs
+  * Enable COMPILER_RT_BUILD_BUILTINS for armel
+  * Drop two unreferenced debian/patches
+  * Mark documentation packages as Multi-Arch: foreign
+  * Convert libclang-common-*-dev to Arch: all/M-A: foreign
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 09 Jan 2024 09:45:17 +0100
 
 llvm-toolchain-17 (1:17.0.6-3) unstable; urgency=medium
 

From ac5a7481d4c0109e36018dbbcc1fe775de6a242c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 9 Jan 2024 11:53:43 +0100
Subject: [PATCH 275/349]  fix changelog

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3604c3b0..492d5507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 llvm-toolchain-17 (1:17.0.6-4) unstable; urgency=medium
 
- [ Matthias Klose ]
- * libclang1-17: Remove the full version symlinks.
+  [ Matthias Klose ]
+  * libclang1-17: Remove the full version symlinks.
 
   [ Faidon Liambotis ]
   * Enable COMPILER_RT_DEFAULT_TARGET_ONLY for all archs

From 70777a3fed2b5eebc6e688b5bfe35300c7af6fb7 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 9 Jan 2024 11:54:56 +0100
Subject: [PATCH 276/349]  fix package name

---
 debian/qualify-clang.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index a8aa3312..d85aaed4 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -9,7 +9,7 @@ VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p")
 DETAILED_VERSION=$(dpkg-parsechangelog |  sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1\2\3,p")
 DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
 
-LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-clang-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb  libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb  liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb"
+LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-clang-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb  libclang-common-${VERSION}-dev_${DETAILED_VERSION}_all.deb  llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb  liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb  llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb  bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb"
 
 echo "To install everything:"
 echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*' 'libunwind-*' 'libclc-*' 'libclc-*dev' 'libmlir-*'"

From 556a6737b62eab978bba9b2cf598181590e6ac43 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 9 Jan 2024 13:03:28 +0100
Subject: [PATCH 277/349] debian/qualify-clang.sh: remove the test of i386 -
 use libcompiler-rt:i386 instead

---
 debian/changelog        | 5 ++++-
 debian/qualify-clang.sh | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 492d5507..fe749e2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 llvm-toolchain-17 (1:17.0.6-4) unstable; urgency=medium
 
+  * debian/qualify-clang.sh: remove the compiler-rt test of i386
+    use libclang-rt-17-dev:i386 instead
+
   [ Matthias Klose ]
   * libclang1-17: Remove the full version symlinks.
 
@@ -10,7 +13,7 @@ llvm-toolchain-17 (1:17.0.6-4) unstable; urgency=medium
   * Mark documentation packages as Multi-Arch: foreign
   * Convert libclang-common-*-dev to Arch: all/M-A: foreign
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 09 Jan 2024 09:45:17 +0100
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 09 Jan 2024 13:03:56 +0100
 
 llvm-toolchain-17 (1:17.0.6-3) unstable; urgency=medium
 
diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index d85aaed4..9d2e4197 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -1655,7 +1655,8 @@ fi
 echo "if it fails, please run"
 echo "apt-get install libc6-dev:i386 libgcc-5-dev:i386 libc6-dev-x32 libx32gcc-5-dev libx32gcc-9-dev"
 for SYSTEM in ""; do
-    for MARCH in -m64 -m32 -mx32 "-m32 -march=i686"; do
+    # add "-m32 -march=i686" -m32 -mx32 to test multiarch with i386
+    for MARCH in -m64; do
         for LIB in --rtlib=compiler-rt -fsanitize=address -fsanitize=thread -fsanitize=memory -fsanitize=undefined -fsanitize=dataflow; do # -fsanitize=efficiency-working-set; do
             if test "$MARCH" == "-m32" -o "$MARCH" == "-mx32"; then
                 if test $LIB == "-fsanitize=thread" -o $LIB == "-fsanitize=memory" -o $LIB == "-fsanitize=dataflow" -o $LIB == "-fsanitize=address" -o $LIB == "-fsanitize=undefined"; then

From bdfce0866c0b60c2b7968c09bf9eee061e7e8ccb Mon Sep 17 00:00:00 2001
From: Faidon Liambotis <paravoid@debian.org>
Date: Wed, 10 Jan 2024 09:32:21 +0200
Subject: [PATCH 278/349] Revert "Enable COMPILER_RT_BUILD_BUILTINS for armel"

FTBFSes with:

FAILED: CMakeFiles/clang_rt.builtins-arm.dir/arm/sync_fetch_and_add_4.S.o
/<<PKGBUILDDIR>>/build-llvm/./bin/clang -target arm-linux-gnueabi -DVISIBILITY_HIDDEN  -O3 -DNDEBUG -fno-lto -std=c11 -fPIC -fno-builtin -fvisibility=hidden -fomit-frame-pointer -DCOMPILER_RT_HAS_FLOAT16 -MD -MT CMakeFiles/clang_rt.builtins-arm.dir/arm/sync_fetch_and_add_4.S.o -MF CMakeFiles/clang_rt.builtins-arm.dir/arm/sync_fetch_and_add_4.S.o.d -o CMakeFiles/clang_rt.builtins-arm.dir/arm/sync_fetch_and_add_4.S.o -c /<<PKGBUILDDIR>>/compiler-rt/lib/builtins/arm/sync_fetch_and_add_4.S
In file included from /<<PKGBUILDDIR>>/compiler-rt/lib/builtins/arm/sync_fetch_and_add_4.S:14:
/<<PKGBUILDDIR>>/compiler-rt/lib/builtins/arm/sync-ops.h:22:2: error: DMB is only supported on ARMv6+
   22 | #error DMB is only supported on ARMv6+
      |  ^

This was despite an upstream commit labeled "[compiler-rt] support
armv4t". Perhaps something going on with the way we configure? Revert
for the time being, until (if) someone cares.

This reverts commit 1b0abffef7149d26f5c0cb6480bfc7016b1673ee.
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index c7bc68be..0fd35b24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -177,6 +177,9 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
 # https://wiki.debian.org/ArmEabiPort
   CFLAGS_EXTRA += -march=armv5t
   CXXFLAGS_EXTRA += -march=armv5t
+# disable compiler-rt builtins (not supported for baseline armel arch: armv5t)
+# See http://lists.llvm.org/pipermail/llvm-dev/2016-May/099761.html
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
   COMPILER_RT_USE_BUILTINS_LIBRARY := OFF
   LIBCXX_USE_COMPILER_RT := OFF
 # disable scudo standalone (not supported for baseline armel arch: armv5t)

From 9a997c558901bb11a38c53e7b3b04f4b81f115fc Mon Sep 17 00:00:00 2001
From: Faidon Liambotis <paravoid@debian.org>
Date: Wed, 10 Jan 2024 09:47:01 +0200
Subject: [PATCH 279/349] Fix i386 FTBFS resulting from
 COMPILER_RT_DEFAULT_TARGET_ONLY

> dh_install: warning: Cannot find (any matches for) "usr/lib/llvm-17/lib/clang/17/bin/hwasan_symbolize" (tried in ., debian/tmp)

hwasan_symbolize is actually an 64-bit-only feature, and was
accidentally included before. Replace the arch opt-out list, with an
opt-in one and a comment pointing to HWASAN_SUPPORTED_ARCH.

> dh_install: warning: Cannot find (any matches for) "usr/lib/llvm-17/lib/clang/17*/lib/linux/liborc_rt*" (tried in ., debian/tmp)

i386 is not in the ALL_ORC_SUPPORTED_ARCH list. Previously, the package
shipped liborc_rt-x86_64.a, but since we don't ship amd64 multilib
binaries anymore, remove the reference.

Addresses regressions introduced with commit:
  400d89390891a1e95eb15837baca64bf000a352b
  Enable COMPILER_RT_DEFAULT_TARGET_ONLY for all archs
---
 debian/clang-tools-X.Y.install.in     | 3 ++-
 debian/libclang-rt-X.Y-dev.install.in | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in
index 3002792a..d69cd402 100644
--- a/debian/clang-tools-X.Y.install.in
+++ b/debian/clang-tools-X.Y.install.in
@@ -61,7 +61,8 @@ usr/lib/llvm-@LLVM_VERSION@/libexec/analyze-cc
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc
 
-[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64 !loong64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
+# See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / HWASAN_SUPPORTED_ARCH
+[amd64 arm64 riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
 
 clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 clang/tools/scan-view-@LLVM_VERSION@       usr/share/clang/
diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in
index ebe7c0bd..be3689b8 100644
--- a/debian/libclang-rt-X.Y-dev.install.in
+++ b/debian/libclang-rt-X.Y-dev.install.in
@@ -7,4 +7,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h
 # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH
-[amd64 arm64 armhf armel i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
+[amd64 arm64 armhf armel] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*

From 2cd430f4933176cfba6ddb1b7c882bc7e6e42928 Mon Sep 17 00:00:00 2001
From: chenli <chenli@loongson.cn>
Date: Mon, 15 Jan 2024 14:14:05 +0800
Subject: [PATCH 280/349] Enable flang on loong64

---
 debian/control    | 4 ++--
 debian/control.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 1d7d6252..6ef2fb2f 100644
--- a/debian/control
+++ b/debian/control
@@ -933,7 +933,7 @@ Description: Post-link optimizer
 Package: flang-17
 # no 32bit support
 # https://github.com/llvm/llvm-project/issues/59845
-Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64
+Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-17-dev (= ${binary:Version}),
 Provides: fortran-compiler, gfortran-mod-15
 Description: Fortran compiler
@@ -944,7 +944,7 @@ Description: Fortran compiler
  of examples, some functionalities are still missing.
 
 Package: libflang-17-dev
-Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64
+Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
 Description: Flang library - Development package
diff --git a/debian/control.in b/debian/control.in
index ee73ffe8..012f6ce3 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -933,7 +933,7 @@ Description: Post-link optimizer
 Package: flang-@LLVM_VERSION@
 # no 32bit support
 # https://github.com/llvm/llvm-project/issues/59845
-Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64
+Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-@LLVM_VERSION@-dev (= ${binary:Version}),
 Provides: fortran-compiler, gfortran-mod-15
 Description: Fortran compiler
@@ -944,7 +944,7 @@ Description: Fortran compiler
  of examples, some functionalities are still missing.
 
 Package: libflang-@LLVM_VERSION@-dev
-Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64
+Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
 Description: Flang library - Development package

From 97c059388eaa742d9b30ae96988d0646f820fc47 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 15 Jan 2024 08:56:07 +0100
Subject: [PATCH 281/349] uploaded

---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fe749e2e..1481fc30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+llvm-toolchain-17 (1:17.0.6-5) unstable; urgency=medium
+
+  [ Faidon Liambotis ]
+  * Revert "Enable COMPILER_RT_BUILD_BUILTINS for armel"
+  * Fix i386 FTBFS resulting from COMPILER_RT_DEFAULT_TARGET_ONLY
+    (Closes: #1060440)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 11 Jan 2024 14:15:09 +0100
+
 llvm-toolchain-17 (1:17.0.6-4) unstable; urgency=medium
 
   * debian/qualify-clang.sh: remove the compiler-rt test of i386

From 2a2d05e96700e2a6b599e672a345e24a3656e01f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 15 Jan 2024 08:56:45 +0100
Subject: [PATCH 282/349] update of the changelog

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1481fc30..9ff4ad2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-17 (1:17.0.6-6) UNRELEASED; urgency=medium
+
+  [ chenli ]
+  * Enable flang on loong64
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 15 Jan 2024 08:56:16 +0100
+
 llvm-toolchain-17 (1:17.0.6-5) unstable; urgency=medium
 
   [ Faidon Liambotis ]

From 9827291d40cf70ef26a6d4c2dec16c10de65100b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 24 Jan 2024 11:51:17 +0100
Subject: [PATCH 283/349] try to enable sccache on 'my' s390x machines

---
 debian/rules | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0fd35b24..c1ba7f25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -509,7 +509,7 @@ SCCACHE_ENABLE=no
 SCCACHE_CMAKE =
 # if sccache is installed in the chroot, use it
 ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes)
-	ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
+	ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64 s390x))
 		STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE)
 		SCCACHE_ENABLE=yes
 		SCCACHE_PATH=/opt/sccache/
@@ -710,8 +710,13 @@ endif
 ifeq (${SCCACHE_ENABLE},yes)
 # Just in case...
 	$(SCCACHE_CMD) --stop-server||true
+ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
 # Start the sccache server with the right set of options to use GCP
-	SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server
+		SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server
+else
+# on s390x machine, use a local cache
+	SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true $(SCCACHE_CMD) --start-server
+endif
 endif
 	echo "Running tests: $(RUN_TEST)"
 	echo "Using cmake: $(CMAKE_BIN)"; \

From a883ee8d454ed0586b99b9289cfa53bee3578b3d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 24 Jan 2024 13:30:08 +0100
Subject: [PATCH 284/349] try to enable sccache on 'my' s390x machines

---
 debian/changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9ff4ad2e..b1e315b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,10 @@ llvm-toolchain-17 (1:17.0.6-6) UNRELEASED; urgency=medium
   [ chenli ]
   * Enable flang on loong64
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 15 Jan 2024 08:56:16 +0100
+  [ Sylvestre Ledru ]
+  * try to enable sccache on 'my' s390x machines
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 24 Jan 2024 13:29:35 +0100
 
 llvm-toolchain-17 (1:17.0.6-5) unstable; urgency=medium
 

From 2fd06c6ff26e6df3756e2591ca8bf38863b5e952 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 26 Jan 2024 10:14:25 +0100
Subject: [PATCH 285/349] on my s390x machines, increase the cache size to 20g

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index c1ba7f25..2bbe4973 100755
--- a/debian/rules
+++ b/debian/rules
@@ -715,7 +715,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
 		SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server
 else
 # on s390x machine, use a local cache
-	SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true $(SCCACHE_CMD) --start-server
+	SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true SCCACHE_CACHE_SIZE="20G" $(SCCACHE_CMD) --start-server
 endif
 endif
 	echo "Running tests: $(RUN_TEST)"

From f312a31f860e4c97409473ac95756137254a5e83 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 7 Feb 2024 23:49:34 +0100
Subject: [PATCH 286/349]   * Remove unused import of imp module in scan-view,
 removed in Python 3.12.

---
 debian/changelog                             |  5 ++++-
 debian/patches/remove-unused-imp-module.diff | 10 ++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/remove-unused-imp-module.diff

diff --git a/debian/changelog b/debian/changelog
index dbe5c98b..615f8276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,10 @@ llvm-toolchain-16 (1:16.0.6-20) UNRELEASED; urgency=medium
   [ John Paul Adrian Glaubitz ]
   * Don't install *clang_rt* on sparc and sparc64
 
- -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Sat, 25 Nov 2023 11:17:15 +0100
+  [ Matthias Klose ]
+  * Remove unused import of imp module in scan-view, removed in Python 3.12.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 07 Feb 2024 23:48:33 +0100
 
 llvm-toolchain-16 (1:16.0.6-19) unstable; urgency=medium
 
diff --git a/debian/patches/remove-unused-imp-module.diff b/debian/patches/remove-unused-imp-module.diff
new file mode 100644
index 00000000..1553232f
--- /dev/null
+++ b/debian/patches/remove-unused-imp-module.diff
@@ -0,0 +1,10 @@
+--- a/clang/tools/scan-view/bin/scan-view
++++ b/clang/tools/scan-view/bin/scan-view
+@@ -6,7 +6,6 @@
+ """
+ 
+ import sys
+-import imp
+ import os
+ import posixpath
+ import threading
diff --git a/debian/patches/series b/debian/patches/series
index f0e08fbc..52c1ee02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -155,3 +155,4 @@ HIP-search-path-fix.patch
 D158066-simd-ppc64el.patch
 
 D142688-loong64.diff
+remove-unused-imp-module.diff

From 8d9b6e5c2b8af0a87335f6d9a3c9f68c2744f346 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 9 Feb 2024 12:37:18 +0100
Subject: [PATCH 287/349] s390x sccache: increase cache size to 20G

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 2bbe4973..bff57d2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -715,7 +715,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
 		SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server
 else
 # on s390x machine, use a local cache
-	SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true SCCACHE_CACHE_SIZE="20G" $(SCCACHE_CMD) --start-server
+	SCCACHE_CACHE_SIZE=20G SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true SCCACHE_CACHE_SIZE="20G" $(SCCACHE_CMD) --start-server
 endif
 endif
 	echo "Running tests: $(RUN_TEST)"

From 4574486306121f968060a81eceba6e0294405b49 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 9 Feb 2024 12:37:30 +0100
Subject: [PATCH 288/349] remove a useless tab

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index bff57d2d..1d53d017 100755
--- a/debian/rules
+++ b/debian/rules
@@ -712,7 +712,7 @@ ifeq (${SCCACHE_ENABLE},yes)
 	$(SCCACHE_CMD) --stop-server||true
 ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
 # Start the sccache server with the right set of options to use GCP
-		SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server
+	SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server
 else
 # on s390x machine, use a local cache
 	SCCACHE_CACHE_SIZE=20G SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true SCCACHE_CACHE_SIZE="20G" $(SCCACHE_CMD) --start-server

From 12912aefc4e66176bba43b629214860cf364b392 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sat, 24 Feb 2024 08:55:48 +0100
Subject: [PATCH 289/349] Upload to sid

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 615f8276..e2aa6217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-16 (1:16.0.6-20) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-20) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
   * Don't install *clang_rt* on sparc and sparc64
@@ -6,7 +6,7 @@ llvm-toolchain-16 (1:16.0.6-20) UNRELEASED; urgency=medium
   [ Matthias Klose ]
   * Remove unused import of imp module in scan-view, removed in Python 3.12.
 
- -- Matthias Klose <doko@debian.org>  Wed, 07 Feb 2024 23:48:33 +0100
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Sat, 24 Feb 2024 08:54:59 +0100
 
 llvm-toolchain-16 (1:16.0.6-19) unstable; urgency=medium
 

From 4f12df35af689e872158a7648f97cad3dd57fa6d Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 3 Mar 2024 11:48:32 +0100
Subject: [PATCH 290/349] Rename for time64_t transition (from Steve Langasek)

---
 debian/changelog                              |   8 +-
 debian/control                                | 102 ++++++++++--------
 debian/control.in                             |  98 +++++++++--------
 debian/libc++1-X.Y.lintian-overrides.in       |   1 -
 ...Y.install.in => libc++1-X.Yt64.install.in} |   0
 ...1-X.Y.links.in => libc++1-X.Yt64.links.in} |   0
 debian/libc++1-X.Yt64.lintian-overrides.in    |   2 +
 debian/libc++abi1-X.Y.lintian-overrides.in    |   1 -
 ...nstall.in => libc++abi1-X.Yt64.install.in} |   0
 ....Y.links.in => libc++abi1-X.Yt64.links.in} |   0
 debian/libc++abi1-X.Yt64.lintian-overrides.in |   2 +
 ...stall.in => libclang-cppX.Yt64.install.in} |   0
 ...Y.links.in => libclang-cppX.Yt64.links.in} |   0
 .../libclang-cppX.Yt64.lintian-overrides.in   |   1 +
 debian/libclang1-X.Y.lintian-overrides.in     |   5 -
 ...install.in => libclang1-X.Yt64.install.in} |   0
 ...X.Y.links.in => libclang1-X.Yt64.links.in} |   0
 debian/libclang1-X.Yt64.lintian-overrides.in  |   6 ++
 ...symbols.in => libclang1-X.Yt64.symbols.in} |   2 +-
 debian/liblldb-X.Y.lintian-overrides.in       |   5 -
 ...Y.install.in => liblldb-X.Yt64.install.in} |   0
 ...b-X.Y.links.in => liblldb-X.Yt64.links.in} |   0
 debian/liblldb-X.Yt64.lintian-overrides.in    |   6 ++
 debian/libllvmX.Y.lintian-overrides.in        |   2 -
 ....Y.install.in => libllvmX.Yt64.install.in} |   0
 ...lvmX.Y.links.in => libllvmX.Yt64.links.in} |   0
 debian/libllvmX.Yt64.lintian-overrides.in     |   3 +
 debian/libmlir-X.Y.lintian-overrides.in       |   1 -
 ...Y.install.in => libmlir-X.Yt64.install.in} |   0
 debian/libmlir-X.Yt64.lintian-overrides.in    |   2 +
 debian/libomp5-X.Y.lintian-overrides.in       |   1 -
 ...Y.install.in => libomp5-X.Yt64.install.in} |   0
 ...5-X.Y.links.in => libomp5-X.Yt64.links.in} |   0
 debian/libomp5-X.Yt64.lintian-overrides.in    |   2 +
 ...Y.symbols.in => libomp5-X.Yt64.symbols.in} |   2 +-
 debian/libunwind-X.Y.lintian-overrides.in     |   1 -
 ...install.in => libunwind-X.Yt64.install.in} |   0
 ...X.Y.links.in => libunwind-X.Yt64.links.in} |   0
 debian/libunwind-X.Yt64.lintian-overrides.in  |   2 +
 debian/rules                                  |  18 ++--
 40 files changed, 158 insertions(+), 115 deletions(-)
 delete mode 100644 debian/libc++1-X.Y.lintian-overrides.in
 rename debian/{libc++1-X.Y.install.in => libc++1-X.Yt64.install.in} (100%)
 rename debian/{libc++1-X.Y.links.in => libc++1-X.Yt64.links.in} (100%)
 create mode 100644 debian/libc++1-X.Yt64.lintian-overrides.in
 delete mode 100644 debian/libc++abi1-X.Y.lintian-overrides.in
 rename debian/{libc++abi1-X.Y.install.in => libc++abi1-X.Yt64.install.in} (100%)
 rename debian/{libc++abi1-X.Y.links.in => libc++abi1-X.Yt64.links.in} (100%)
 create mode 100644 debian/libc++abi1-X.Yt64.lintian-overrides.in
 rename debian/{libclang-cppX.Y.install.in => libclang-cppX.Yt64.install.in} (100%)
 rename debian/{libclang-cppX.Y.links.in => libclang-cppX.Yt64.links.in} (100%)
 create mode 100644 debian/libclang-cppX.Yt64.lintian-overrides.in
 delete mode 100644 debian/libclang1-X.Y.lintian-overrides.in
 rename debian/{libclang1-X.Y.install.in => libclang1-X.Yt64.install.in} (100%)
 rename debian/{libclang1-X.Y.links.in => libclang1-X.Yt64.links.in} (100%)
 create mode 100644 debian/libclang1-X.Yt64.lintian-overrides.in
 rename debian/{libclang1-X.Y.symbols.in => libclang1-X.Yt64.symbols.in} (99%)
 delete mode 100644 debian/liblldb-X.Y.lintian-overrides.in
 rename debian/{liblldb-X.Y.install.in => liblldb-X.Yt64.install.in} (100%)
 rename debian/{liblldb-X.Y.links.in => liblldb-X.Yt64.links.in} (100%)
 create mode 100644 debian/liblldb-X.Yt64.lintian-overrides.in
 delete mode 100644 debian/libllvmX.Y.lintian-overrides.in
 rename debian/{libllvmX.Y.install.in => libllvmX.Yt64.install.in} (100%)
 rename debian/{libllvmX.Y.links.in => libllvmX.Yt64.links.in} (100%)
 create mode 100644 debian/libllvmX.Yt64.lintian-overrides.in
 delete mode 100644 debian/libmlir-X.Y.lintian-overrides.in
 rename debian/{libmlir-X.Y.install.in => libmlir-X.Yt64.install.in} (100%)
 create mode 100644 debian/libmlir-X.Yt64.lintian-overrides.in
 delete mode 100644 debian/libomp5-X.Y.lintian-overrides.in
 rename debian/{libomp5-X.Y.install.in => libomp5-X.Yt64.install.in} (100%)
 rename debian/{libomp5-X.Y.links.in => libomp5-X.Yt64.links.in} (100%)
 create mode 100644 debian/libomp5-X.Yt64.lintian-overrides.in
 rename debian/{libomp5-X.Y.symbols.in => libomp5-X.Yt64.symbols.in} (99%)
 delete mode 100644 debian/libunwind-X.Y.lintian-overrides.in
 rename debian/{libunwind-X.Y.install.in => libunwind-X.Yt64.install.in} (100%)
 rename debian/{libunwind-X.Y.links.in => libunwind-X.Yt64.links.in} (100%)
 create mode 100644 debian/libunwind-X.Yt64.lintian-overrides.in

diff --git a/debian/changelog b/debian/changelog
index b1e315b1..ed9bc4e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-17 (1:17.0.6-6) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-6) unstable; urgency=medium
 
   [ chenli ]
   * Enable flang on loong64
@@ -6,6 +6,12 @@ llvm-toolchain-17 (1:17.0.6-6) UNRELEASED; urgency=medium
   [ Sylvestre Ledru ]
   * try to enable sccache on 'my' s390x machines
 
+  [ Steve Langasek ]
+  * Rename libraries for 64-bit time_t transition.
+
+  [ Gianfranco Costamagna ]
+  * Fix 32bit builds
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 24 Jan 2024 13:29:35 +0100
 
 llvm-toolchain-17 (1:17.0.6-5) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 6ef2fb2f..d7551988 100644
--- a/debian/control
+++ b/debian/control
@@ -45,10 +45,10 @@ Package: clang-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc},
- libllvm17 (= ${binary:Version}),
+ libllvm17t64 (= ${binary:Version}),
  libclang-common-17-dev (= ${source:Version}),
  llvm-17-linker-tools (= ${binary:Version}),
- libclang1-17 (= ${binary:Version}), libc6-dev, binutils
+ libclang1-17t64 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-17-dev, python3
 # libomp-17-dev
@@ -78,7 +78,7 @@ Description: clang-based tools for C/C++ developments
 Package: clang-format-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm17 (= ${binary:Version})
+ libllvm17t64 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
  Clang-format is both a library and a stand-alone tool with the goal of
  automatically reformatting C++ sources files according to configurable
@@ -94,7 +94,7 @@ Description: Tool to format C/C++/Obj-C code
 Package: clang-tidy-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm17 (= ${binary:Version}),
+ libllvm17t64 (= ${binary:Version}),
  libclang-common-17-dev (= ${source:Version}),
  clang-tools-17, python3-yaml
 Description: clang-based C++ linter tool
@@ -106,7 +106,7 @@ Description: clang-based C++ linter tool
 Package: clangd-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libllvm17 (= ${binary:Version}),
+ libllvm17t64 (= ${binary:Version}),
  libclang-common-17-dev (= ${source:Version}),
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
@@ -133,7 +133,10 @@ Description: C, C++ and Objective-C compiler - Documentation
  .
  This package contains the documentation.
 
-Package: libclang1-17
+Package: libclang1-17t64
+Provides: ${t64:Provides}
+Replaces: libclang1-17
+Breaks: libclang1-17 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -158,7 +161,7 @@ Package: libclang-17-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang1-17 (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang1-17t64 (= ${binary:Version}),
  libclang-common-17-dev (= ${source:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -234,10 +237,13 @@ Description: High-level loop and data-locality optimizer
 
 # ------------- clang libraries -------------
 
-Package: libclang-cpp17
+Package: libclang-cpp17t64
+Provides: ${t64:Provides}
+Replaces: libclang-cpp17
+Breaks: libclang-cpp17 (<< ${source:Version})
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -259,7 +265,7 @@ Package: libclang-cpp17-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-cpp17 (= ${binary:Version})
+ libclang-cpp17t64 (= ${binary:Version})
 # Move of libclang-cpp.so into libclang-cpp17.dev
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -336,7 +342,10 @@ Description: Clang examples
 
 # ------------- LLVM -------------
 
-Package: libllvm17
+Package: libllvm17t64
+Provides: ${t64:Provides}
+Replaces: libllvm17
+Breaks: libllvm17 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -412,8 +421,8 @@ Description: Modular compiler and toolchain technologies, IR interpreter
 Package: llvm-17-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
- llvm-17 (= ${binary:Version}), libllvm17 (= ${binary:Version}), libncurses-dev,
- llvm-17-tools (= ${binary:Version}), libclang-cpp17 (= ${binary:Version}),
+ llvm-17 (= ${binary:Version}), libllvm17t64 (= ${binary:Version}), libncurses-dev,
+ llvm-17-tools (= ${binary:Version}), libclang-cpp17t64 (= ${binary:Version}),
  libz3-dev, libxml2-dev
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
@@ -520,7 +529,7 @@ Description: Modular compiler and toolchain technologies, examples
 Package: lld-17
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -530,7 +539,7 @@ Description: LLVM-based linker
 Package: liblld-17
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: LLVM-based linker, library
@@ -560,7 +569,7 @@ Description: LLVM-based linker, header files
 Package: lldb-17
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version}),
  python3-lldb-17
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
@@ -568,10 +577,13 @@ Description: Next generation, high-performance debugger
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: liblldb-17
+Package: liblldb-17t64
+Provides: ${t64:Provides}
+Replaces: liblldb-17
+Breaks: liblldb-17 (<< ${source:Version})
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: Next generation, high-performance debugger, library
@@ -585,7 +597,7 @@ Package: python3-lldb-17
 Section: python
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-17t64 (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y
@@ -618,7 +630,7 @@ Description: Next generation, high-performance debugger, header files
 Package: libomp-17-dev
 Section: libdevel
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
-Depends: libomp5-17 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libomp5-17t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-17-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
 Provides: libomp-x.y-dev
@@ -629,14 +641,14 @@ Description: LLVM OpenMP runtime - dev package
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp5-17
+Package: libomp5-17t64
 Multi-Arch: same
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libomp5 (<< 44)
-Provides: libomp-x.y
+Breaks: libomp5-17 (<< ${source:Version}), libomp5 (<< 44)
+Provides: ${t64:Provides}, libomp-x.y
 Conflicts: libomp-x.y
-Replaces: libomp-x.y
+Replaces: libomp5-17, libomp-x.y
 Description: LLVM OpenMP runtime
  The runtime is the part of the OpenMP implementation that your code is
  linked against, and that manages the multiple threads in an OpenMP program
@@ -658,17 +670,17 @@ Description: LLVM OpenMP runtime - Documentation
 
 # ------------- libcxx -------------
 
-Package: libc++1-17
+Package: libc++1-17t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
-Breaks: libc++1 (<< 44)
-Provides: libc++-x.y
+Breaks: libc++1-17 (<< ${source:Version}), libc++1 (<< 44)
+Provides: ${t64:Provides}, libc++-x.y
 Conflicts: libc++-x.y
-Replaces: libc++-x.y
+Replaces: libc++1-17, libc++-x.y
 Description: LLVM C++ Standard library
  libc++ is another implementation of the C++ standard library.
  .
@@ -686,13 +698,13 @@ Package: libc++-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends},
+Depends: libc++1-17t64 (= ${binary:Version}), ${misc:Depends},
  libc++abi-17-dev (= ${binary:Version}),
  libunwind-17-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
-Breaks: libc++-dev (<< 44), libc++abi-17-dev (<< 1:17.0.6-2)
+Breaks: libc++-dev (<< 44), libc++abi-17-dev (<< 1:17.0.6~++20231206041259)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
-Replaces: libc++-x.y-dev, libc++abi-17-dev (<< 1:17.0.6-2)
+Replaces: libc++-x.y-dev, libc++abi-17-dev (<< 1:17.0.6~++20231206041259)
 Description: LLVM C++ Standard library (development files)
  libc++ is another implementation of the C++ standard library
  .
@@ -731,16 +743,16 @@ Description: LLVM C++ Standard library (WASI)
 
 # ------------- libcxxabi -------------
 
-Package: libc++abi1-17
+Package: libc++abi1-17t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libc++abi1 (<< 44)
-Provides: libc++abi-x.y
+Breaks: libc++abi1-17 (<< ${source:Version}), libc++abi1 (<< 44)
+Provides: ${t64:Provides}, libc++abi-x.y
 Conflicts: libc++abi-x.y
-Replaces: libc++abi-x.y
+Replaces: libc++abi1-17, libc++abi-x.y
 Description: LLVM low level support for a standard C++ library
  libc++abi is another implementation of low level support for a standard C++
  library.
@@ -754,7 +766,7 @@ Package: libc++abi-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++abi1-17 (= ${binary:Version}), ${misc:Depends}
+Depends: libc++abi1-17t64 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++abi-dev (<= 44)
 Provides: libc++abi-x.y-dev
 Conflicts: libc++abi-x.y-dev
@@ -826,15 +838,16 @@ Description: OpenCL C language implementation - development files
 
 # ------------- libunwind -------------
 
-Package: libunwind-17
+Package: libunwind-17t64
+Breaks: libunwind-17 (<< ${source:Version})
 Section: libs
 Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libunwind-x.y
+Provides: ${t64:Provides}, libunwind-x.y
 Conflicts: libunwind-x.y
-Replaces: libunwind-x.y
+Replaces: libunwind-17, libunwind-x.y
 Description: production-quality unwinder
  libunwind is a production-quality unwinder, with platform support for DWARF
  unwind info, SjLj, and ARM EHABI.
@@ -849,7 +862,7 @@ Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libunwind-17 (= ${binary:Version})
+ libunwind-17t64 (= ${binary:Version})
 Provides: libunwind-dev, libunwind-x.y-dev
 Conflicts: libunwind-dev, libunwind-x.y-dev
 Replaces: libunwind-dev, libunwind-x.y-dev
@@ -874,15 +887,16 @@ Description: Multi-Level Intermediate Representation tools
  .
  This package provides tools.
 
-Package: libmlir-17
+Package: libmlir-17t64
+Breaks: libmlir-17 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libmlir-x.y
+Provides: ${t64:Provides}, libmlir-x.y
 Conflicts: libmlir-x.y
-Replaces: libmlir-x.y
+Replaces: libmlir-17, libmlir-x.y
 Description: Multi-Level Intermediate Representation library
  Novel approach to building reusable and extensible compiler infrastructure.
  MLIR aims to address software fragmentation, improve compilation for
@@ -896,7 +910,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libmlir-17 (= ${binary:Version})
+ libmlir-17t64 (= ${binary:Version})
 Breaks: libmlir-dev
 Provides: libmlir-x.y-dev
 Conflicts: libmlir-x.y-dev
diff --git a/debian/control.in b/debian/control.in
index 012f6ce3..94eb46f7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -45,10 +45,10 @@ Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc},
- libllvm@LLVM_VERSION@ (= ${binary:Version}),
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
  libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
- libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
+ libclang1-@LLVM_VERSION@t64 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-@LLVM_VERSION@-dev, python3
 # libomp-@LLVM_VERSION@-dev
@@ -78,7 +78,7 @@ Description: clang-based tools for C/C++ developments
 Package: clang-format-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm@LLVM_VERSION@ (= ${binary:Version})
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
  Clang-format is both a library and a stand-alone tool with the goal of
  automatically reformatting C++ sources files according to configurable
@@ -94,7 +94,7 @@ Description: Tool to format C/C++/Obj-C code
 Package: clang-tidy-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm@LLVM_VERSION@ (= ${binary:Version}),
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
  libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
  clang-tools-@LLVM_VERSION@, python3-yaml
 Description: clang-based C++ linter tool
@@ -106,7 +106,7 @@ Description: clang-based C++ linter tool
 Package: clangd-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libllvm@LLVM_VERSION@ (= ${binary:Version}),
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
  libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
@@ -133,7 +133,10 @@ Description: C, C++ and Objective-C compiler - Documentation
  .
  This package contains the documentation.
 
-Package: libclang1-@LLVM_VERSION@
+Package: libclang1-@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: libclang1-@LLVM_VERSION@
+Breaks: libclang1-@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -158,7 +161,7 @@ Package: libclang-@LLVM_VERSION@-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@ (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@t64 (= ${binary:Version}),
  libclang-common-@LLVM_VERSION@-dev (= ${source:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -234,10 +237,13 @@ Description: High-level loop and data-locality optimizer
 
 # ------------- clang libraries -------------
 
-Package: libclang-cpp@LLVM_VERSION@
+Package: libclang-cpp@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: libclang-cpp@LLVM_VERSION@
+Breaks: libclang-cpp@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -259,7 +265,7 @@ Package: libclang-cpp@LLVM_VERSION@-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-cpp@LLVM_VERSION@ (= ${binary:Version})
+ libclang-cpp@LLVM_VERSION@t64 (= ${binary:Version})
 # Move of libclang-cpp.so into libclang-cpp@LLVM_VERSION@.dev
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -336,7 +342,10 @@ Description: Clang examples
 
 # ------------- LLVM -------------
 
-Package: libllvm@LLVM_VERSION@
+Package: libllvm@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: libllvm@LLVM_VERSION@
+Breaks: libllvm@LLVM_VERSION@ (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -412,8 +421,8 @@ Description: Modular compiler and toolchain technologies, IR interpreter
 Package: llvm-@LLVM_VERSION@-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
- llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@ (= ${binary:Version}), libncurses-dev,
- llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@ (= ${binary:Version}),
+ llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@t64 (= ${binary:Version}), libncurses-dev,
+ llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@t64 (= ${binary:Version}),
  libz3-dev, libxml2-dev
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
@@ -520,7 +529,7 @@ Description: Modular compiler and toolchain technologies, examples
 Package: lld-@LLVM_VERSION@
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -530,7 +539,7 @@ Description: LLVM-based linker
 Package: liblld-@LLVM_VERSION@
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: LLVM-based linker, library
@@ -560,7 +569,7 @@ Description: LLVM-based linker, header files
 Package: lldb-@LLVM_VERSION@
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
  python3-lldb-@LLVM_VERSION@
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
@@ -568,10 +577,13 @@ Description: Next generation, high-performance debugger
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: liblldb-@LLVM_VERSION@
+Package: liblldb-@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: liblldb-@LLVM_VERSION@
+Breaks: liblldb-@LLVM_VERSION@ (<< ${source:Version})
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: Next generation, high-performance debugger, library
@@ -585,7 +597,7 @@ Package: python3-lldb-@LLVM_VERSION@
 Section: python
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@t64 (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y
@@ -618,7 +630,7 @@ Description: Next generation, high-performance debugger, header files
 Package: libomp-@LLVM_VERSION@-dev
 Section: libdevel
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
-Depends: libomp5-@LLVM_VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libomp5-@LLVM_VERSION@t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-@LLVM_VERSION@-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
 Provides: libomp-x.y-dev
@@ -629,14 +641,14 @@ Description: LLVM OpenMP runtime - dev package
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp5-@LLVM_VERSION@
+Package: libomp5-@LLVM_VERSION@t64
 Multi-Arch: same
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libomp5 (<< 44)
-Provides: libomp-x.y
+Breaks: libomp5-@LLVM_VERSION@ (<< ${source:Version}), libomp5 (<< 44)
+Provides: ${t64:Provides}, libomp-x.y
 Conflicts: libomp-x.y
-Replaces: libomp-x.y
+Replaces: libomp5-@LLVM_VERSION@, libomp-x.y
 Description: LLVM OpenMP runtime
  The runtime is the part of the OpenMP implementation that your code is
  linked against, and that manages the multiple threads in an OpenMP program
@@ -658,17 +670,17 @@ Description: LLVM OpenMP runtime - Documentation
 
 # ------------- libcxx -------------
 
-Package: libc++1-@LLVM_VERSION@
+Package: libc++1-@LLVM_VERSION@t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
-Breaks: libc++1 (<< 44)
-Provides: libc++-x.y
+Breaks: libc++1-@LLVM_VERSION@ (<< ${source:Version}), libc++1 (<< 44)
+Provides: ${t64:Provides}, libc++-x.y
 Conflicts: libc++-x.y
-Replaces: libc++-x.y
+Replaces: libc++1-@LLVM_VERSION@, libc++-x.y
 Description: LLVM C++ Standard library
  libc++ is another implementation of the C++ standard library.
  .
@@ -686,7 +698,7 @@ Package: libc++-@LLVM_VERSION@-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends},
+Depends: libc++1-@LLVM_VERSION@t64 (= ${binary:Version}), ${misc:Depends},
  libc++abi-@LLVM_VERSION@-dev (= ${binary:Version}),
  libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:17.0.6-2)
@@ -731,16 +743,16 @@ Description: LLVM C++ Standard library (WASI)
 
 # ------------- libcxxabi -------------
 
-Package: libc++abi1-@LLVM_VERSION@
+Package: libc++abi1-@LLVM_VERSION@t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libc++abi1 (<< 44)
-Provides: libc++abi-x.y
+Breaks: libc++abi1-@LLVM_VERSION@ (<< ${source:Version}), libc++abi1 (<< 44)
+Provides: ${t64:Provides}, libc++abi-x.y
 Conflicts: libc++abi-x.y
-Replaces: libc++abi-x.y
+Replaces: libc++abi1-@LLVM_VERSION@, libc++abi-x.y
 Description: LLVM low level support for a standard C++ library
  libc++abi is another implementation of low level support for a standard C++
  library.
@@ -754,7 +766,7 @@ Package: libc++abi-@LLVM_VERSION@-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++abi1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}
+Depends: libc++abi1-@LLVM_VERSION@t64 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++abi-dev (<= 44)
 Provides: libc++abi-x.y-dev
 Conflicts: libc++abi-x.y-dev
@@ -826,15 +838,16 @@ Description: OpenCL C language implementation - development files
 
 # ------------- libunwind -------------
 
-Package: libunwind-@LLVM_VERSION@
+Package: libunwind-@LLVM_VERSION@t64
+Breaks: libunwind-@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libunwind-x.y
+Provides: ${t64:Provides}, libunwind-x.y
 Conflicts: libunwind-x.y
-Replaces: libunwind-x.y
+Replaces: libunwind-@LLVM_VERSION@, libunwind-x.y
 Description: production-quality unwinder
  libunwind is a production-quality unwinder, with platform support for DWARF
  unwind info, SjLj, and ARM EHABI.
@@ -849,7 +862,7 @@ Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libunwind-@LLVM_VERSION@ (= ${binary:Version})
+ libunwind-@LLVM_VERSION@t64 (= ${binary:Version})
 Provides: libunwind-dev, libunwind-x.y-dev
 Conflicts: libunwind-dev, libunwind-x.y-dev
 Replaces: libunwind-dev, libunwind-x.y-dev
@@ -874,15 +887,16 @@ Description: Multi-Level Intermediate Representation tools
  .
  This package provides tools.
 
-Package: libmlir-@LLVM_VERSION@
+Package: libmlir-@LLVM_VERSION@t64
+Breaks: libmlir-@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libmlir-x.y
+Provides: ${t64:Provides}, libmlir-x.y
 Conflicts: libmlir-x.y
-Replaces: libmlir-x.y
+Replaces: libmlir-@LLVM_VERSION@, libmlir-x.y
 Description: Multi-Level Intermediate Representation library
  Novel approach to building reusable and extensible compiler infrastructure.
  MLIR aims to address software fragmentation, improve compilation for
@@ -896,7 +910,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libmlir-@LLVM_VERSION@ (= ${binary:Version})
+ libmlir-@LLVM_VERSION@t64 (= ${binary:Version})
 Breaks: libmlir-dev
 Provides: libmlir-x.y-dev
 Conflicts: libmlir-x.y-dev
diff --git a/debian/libc++1-X.Y.lintian-overrides.in b/debian/libc++1-X.Y.lintian-overrides.in
deleted file mode 100644
index 8e1532d4..00000000
--- a/debian/libc++1-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libc++1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0*
diff --git a/debian/libc++1-X.Y.install.in b/debian/libc++1-X.Yt64.install.in
similarity index 100%
rename from debian/libc++1-X.Y.install.in
rename to debian/libc++1-X.Yt64.install.in
diff --git a/debian/libc++1-X.Y.links.in b/debian/libc++1-X.Yt64.links.in
similarity index 100%
rename from debian/libc++1-X.Y.links.in
rename to debian/libc++1-X.Yt64.links.in
diff --git a/debian/libc++1-X.Yt64.lintian-overrides.in b/debian/libc++1-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..25a325fa
--- /dev/null
+++ b/debian/libc++1-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libc++1-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0*
+libc++1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libc++1-@LLVM_VERSION@
diff --git a/debian/libc++abi1-X.Y.lintian-overrides.in b/debian/libc++abi1-X.Y.lintian-overrides.in
deleted file mode 100644
index 0637b505..00000000
--- a/debian/libc++abi1-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libc++abi1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0*
diff --git a/debian/libc++abi1-X.Y.install.in b/debian/libc++abi1-X.Yt64.install.in
similarity index 100%
rename from debian/libc++abi1-X.Y.install.in
rename to debian/libc++abi1-X.Yt64.install.in
diff --git a/debian/libc++abi1-X.Y.links.in b/debian/libc++abi1-X.Yt64.links.in
similarity index 100%
rename from debian/libc++abi1-X.Y.links.in
rename to debian/libc++abi1-X.Yt64.links.in
diff --git a/debian/libc++abi1-X.Yt64.lintian-overrides.in b/debian/libc++abi1-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..c3100c96
--- /dev/null
+++ b/debian/libc++abi1-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libc++abi1-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0*
+libc++abi1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libc++abi1-@LLVM_VERSION@
diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Yt64.install.in
similarity index 100%
rename from debian/libclang-cppX.Y.install.in
rename to debian/libclang-cppX.Yt64.install.in
diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Yt64.links.in
similarity index 100%
rename from debian/libclang-cppX.Y.links.in
rename to debian/libclang-cppX.Yt64.links.in
diff --git a/debian/libclang-cppX.Yt64.lintian-overrides.in b/debian/libclang-cppX.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..5d4a86a8
--- /dev/null
+++ b/debian/libclang-cppX.Yt64.lintian-overrides.in
@@ -0,0 +1 @@
+libclang-cpp@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang-cpp@LLVM_VERSION@
diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in
deleted file mode 100644
index 86038455..00000000
--- a/debian/libclang1-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# I know and I am not planning to change that yet.
-libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang-@LLVM_VERSION@-1
-# Provided as transition
-libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so
-libclang1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so
diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Yt64.install.in
similarity index 100%
rename from debian/libclang1-X.Y.install.in
rename to debian/libclang1-X.Yt64.install.in
diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Yt64.links.in
similarity index 100%
rename from debian/libclang1-X.Y.links.in
rename to debian/libclang1-X.Yt64.links.in
diff --git a/debian/libclang1-X.Yt64.lintian-overrides.in b/debian/libclang1-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..c0e016cc
--- /dev/null
+++ b/debian/libclang1-X.Yt64.lintian-overrides.in
@@ -0,0 +1,6 @@
+# I know and I am not planning to change that yet.
+libclang1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang-@LLVM_VERSION@-1
+# Provided as transition
+libclang1-@LLVM_VERSION@t64: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so
+libclang1-@LLVM_VERSION@t64: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so
+libclang1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@
diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Yt64.symbols.in
similarity index 99%
rename from debian/libclang1-X.Y.symbols.in
rename to debian/libclang1-X.Yt64.symbols.in
index 2f07205d..35c74c56 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Yt64.symbols.in
@@ -1,4 +1,4 @@
-libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
+libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@t64 #MINVER#
  (optional)LLVM_13@LLVM_13 1:15.0.7-3
  (optional)LLVM_16@LLVM_16 1:16.0.2-1
  (optional)LLVM_17@LLVM_17 1:17.0.1-1
diff --git a/debian/liblldb-X.Y.lintian-overrides.in b/debian/liblldb-X.Y.lintian-overrides.in
deleted file mode 100644
index 180aec35..00000000
--- a/debian/liblldb-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# That is normal. The lib is not (yet?) shipped as a new package
-liblldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@-1
-# For now, override this warning. We might create a -dev at some point
-liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
-liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-@LLVM_VERSION@.so.1 usr/lib/*/liblldb-@LLVM_VERSION@.so
diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Yt64.install.in
similarity index 100%
rename from debian/liblldb-X.Y.install.in
rename to debian/liblldb-X.Yt64.install.in
diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Yt64.links.in
similarity index 100%
rename from debian/liblldb-X.Y.links.in
rename to debian/liblldb-X.Yt64.links.in
diff --git a/debian/liblldb-X.Yt64.lintian-overrides.in b/debian/liblldb-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..02752489
--- /dev/null
+++ b/debian/liblldb-X.Yt64.lintian-overrides.in
@@ -0,0 +1,6 @@
+# That is normal. The lib is not (yet?) shipped as a new package
+liblldb-@LLVM_VERSION@t64: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@t64-1
+# For now, override this warning. We might create a -dev at some point
+liblldb-@LLVM_VERSION@t64: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
+liblldb-@LLVM_VERSION@t64: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-@LLVM_VERSION@t64.so.1 usr/lib/*/liblldb-@LLVM_VERSION@t64.so
+liblldb-@LLVM_VERSION@t64: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@
diff --git a/debian/libllvmX.Y.lintian-overrides.in b/debian/libllvmX.Y.lintian-overrides.in
deleted file mode 100644
index 49f7ef24..00000000
--- a/debian/libllvmX.Y.lintian-overrides.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# That is normal. Upstream does not match the debian convention
-libllvm@LLVM_VERSION@: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1
diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Yt64.install.in
similarity index 100%
rename from debian/libllvmX.Y.install.in
rename to debian/libllvmX.Yt64.install.in
diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Yt64.links.in
similarity index 100%
rename from debian/libllvmX.Y.links.in
rename to debian/libllvmX.Yt64.links.in
diff --git a/debian/libllvmX.Yt64.lintian-overrides.in b/debian/libllvmX.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..40fd72df
--- /dev/null
+++ b/debian/libllvmX.Yt64.lintian-overrides.in
@@ -0,0 +1,3 @@
+# That is normal. Upstream does not match the debian convention
+libllvm@LLVM_VERSION@t64: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1
+libllvm@LLVM_VERSION@t64: package-name-doesnt-match-sonames libllvm@LLVM_VERSION@
diff --git a/debian/libmlir-X.Y.lintian-overrides.in b/debian/libmlir-X.Y.lintian-overrides.in
deleted file mode 100644
index f2f020ba..00000000
--- a/debian/libmlir-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libmlir-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/*
diff --git a/debian/libmlir-X.Y.install.in b/debian/libmlir-X.Yt64.install.in
similarity index 100%
rename from debian/libmlir-X.Y.install.in
rename to debian/libmlir-X.Yt64.install.in
diff --git a/debian/libmlir-X.Yt64.lintian-overrides.in b/debian/libmlir-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..50568c40
--- /dev/null
+++ b/debian/libmlir-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libmlir-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/*
+libmlir-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libmlir-@LLVM_VERSION@
diff --git a/debian/libomp5-X.Y.lintian-overrides.in b/debian/libomp5-X.Y.lintian-overrides.in
deleted file mode 100644
index 335e58e9..00000000
--- a/debian/libomp5-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libomp5-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5*
diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Yt64.install.in
similarity index 100%
rename from debian/libomp5-X.Y.install.in
rename to debian/libomp5-X.Yt64.install.in
diff --git a/debian/libomp5-X.Y.links.in b/debian/libomp5-X.Yt64.links.in
similarity index 100%
rename from debian/libomp5-X.Y.links.in
rename to debian/libomp5-X.Yt64.links.in
diff --git a/debian/libomp5-X.Yt64.lintian-overrides.in b/debian/libomp5-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..0bbf0689
--- /dev/null
+++ b/debian/libomp5-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libomp5-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5*
+libomp5-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libomp5-@LLVM_VERSION@
diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Yt64.symbols.in
similarity index 99%
rename from debian/libomp5-X.Y.symbols.in
rename to debian/libomp5-X.Yt64.symbols.in
index ce0fe517..dcc64e8c 100644
--- a/debian/libomp5-X.Y.symbols.in
+++ b/debian/libomp5-X.Yt64.symbols.in
@@ -1,4 +1,4 @@
-libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
+libomp.so.5 libomp5-@LLVM_VERSION@t64 #MINVER#
  GOMP_1.0@GOMP_1.0 0.20131209
  GOMP_2.0@GOMP_2.0 0.20131209
  GOMP_3.0@GOMP_3.0 0.20131209
diff --git a/debian/libunwind-X.Y.lintian-overrides.in b/debian/libunwind-X.Y.lintian-overrides.in
deleted file mode 100644
index 6cb74223..00000000
--- a/debian/libunwind-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libunwind-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0*
diff --git a/debian/libunwind-X.Y.install.in b/debian/libunwind-X.Yt64.install.in
similarity index 100%
rename from debian/libunwind-X.Y.install.in
rename to debian/libunwind-X.Yt64.install.in
diff --git a/debian/libunwind-X.Y.links.in b/debian/libunwind-X.Yt64.links.in
similarity index 100%
rename from debian/libunwind-X.Y.links.in
rename to debian/libunwind-X.Yt64.links.in
diff --git a/debian/libunwind-X.Yt64.lintian-overrides.in b/debian/libunwind-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..3683dc8c
--- /dev/null
+++ b/debian/libunwind-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libunwind-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0*
+libunwind-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libunwind-@LLVM_VERSION@
diff --git a/debian/rules b/debian/rules
index 1d53d017..db8b6cac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -610,7 +610,7 @@ stamps/preconfigure:
 		debian/libclang-rt-$(LLVM_VERSION)-dev.install \
 		debian/libpolly-$(LLVM_VERSION)-dev.install \
 		debian/libomp-$(LLVM_VERSION)-dev.install \
-		debian/libomp5-$(LLVM_VERSION).install \
+		debian/libomp5-$(LLVM_VERSION)t64.install \
 		debian/llvm-$(LLVM_VERSION)-dev.install \
 		debian/llvm-$(LLVM_VERSION)-linker-tools.install \
 		debian/llvm-$(LLVM_VERSION)-linker-tools.links \
@@ -1298,10 +1298,10 @@ endif
 
 
 override_dh_makeshlibs:
-	dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION)
-	dh_makeshlibs -pliblldb-$(LLVM_VERSION)
-	dh_makeshlibs -plibllvm$(LLVM_VERSION)
-	dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION)
+	dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION)t64
+	dh_makeshlibs -pliblldb-$(LLVM_VERSION)t64
+	dh_makeshlibs -plibllvm$(LLVM_VERSION)t64
+	dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64
 	dh_makeshlibs --remaining-packages -V
 
 override_dh_shlibdeps:
@@ -1322,10 +1322,10 @@ override_dh_strip:
 	find $(TARGET_BUILD) -name '*.o' -o -name '*.a' -type f | xargs -r rm -f
 ifeq (0, $(strip $(shell dpkg --compare-versions $(DH_VERSION) ge 9.20160114; echo $$?)))
 	: # If we don't have the right version of debhelper, don't run the option
-	dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg'
-	dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg'
-	dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg'
-	dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg'
+	dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION)t64 --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)t64-dbg'
+	dh_strip -p libllvm$(LLVM_VERSION)t64 --dbgsym-migration='libllvm$(LLVM_VERSION)t64-dbg'
+	dh_strip -p liblldb-$(LLVM_VERSION)t64 --dbgsym-migration='liblldb-$(LLVM_VERSION)t64-dbg'
+	dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64 --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64-dbg'
 endif
 # ifeq (${LLD_ENABLE},yes)
 # 	PATH=$(CURDIR)/:$$PATH dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg

From 2987ecf226e14a32e6f3d91d81ff240bf84642c2 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 3 Mar 2024 11:54:05 +0100
Subject: [PATCH 291/349] Disable compiler-rt on 32bit architectures except
 i386

---
 debian/rules | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index db8b6cac..0754c670 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 # polly & lldb aren't enabled for every platform
 PROJECTS = clang;clang-tools-extra;lld;cross-project-tests;mlir
 # openmp & libunwind aren't enabled for every platform
-RUNTIMES = compiler-rt;libcxx;libcxxabi
 
 TARGET_BUILD	:= build-llvm
 TARGET_BUILD_STAGE2    := $(TARGET_BUILD)/tools/clang/stage2-bins
@@ -22,6 +21,25 @@ ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL))
 endif
 LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$NF+=1; print}')
 
+# dpkg-buildflags support
+# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
+export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
+ifeq ($(DEB_HOST_ARCH),i386)
+  RUNTIMES = compiler-rt;libcxx;libcxxabi
+else
+  ifeq ($(DEB_HOST_ARCH_BITS),32)
+    RUNTIMES = libcxx;libcxxabi
+    skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev
+  else
+    RUNTIMES = compiler-rt;libcxx;libcxxabi
+    ifeq ($(DEB_HOST_ARCH),mips64el)
+      export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong
+      CFLAGS_EXTRA += -mxgot
+      CXXFLAGS_EXTRA += -mxgot
+    endif
+  endif
+endif
+
 SOURCE_NAME := $(shell dpkg-parsechangelog -S Source)
 ifneq (,$(findstring snapshot,$(SOURCE_NAME)))
   BRANCH_NAME=snapshot
@@ -63,9 +81,6 @@ include /usr/share/dpkg/architecture.mk
 
 CONFIGURE_EXTRA =
 
-# dpkg-buildflags support
-# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
-export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
 # these are handled on a per stage / build basis
 ifeq ($(VENDOR)-$(DEB_HOST_ARCH),Ubuntu-ppc64el)
   export DEB_CFLAGS_MAINT_STRIP = -g -O3
@@ -1112,7 +1127,7 @@ override_dh_auto_install:
 ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64))
 ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 	# To fix custom-library-search-path
-	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so
+	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so || true
 endif
 endif
 
@@ -1364,7 +1379,7 @@ else
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
 endif
 endif
-	dh_install --fail-missing
+	dh_install --fail-missing ${skip_packages}
 # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages
 # These packages are arch: all, so only do so when the packages are built
 ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(packages)))
@@ -1492,8 +1507,11 @@ override_dh_auto_test:
 endif
 
 
+override_dh_builddeb:
+	dh_builddeb ${skip_packages}
+
 override_dh_gencontrol: stamps/sccache-stats
-	dh_gencontrol -- $(control_vars)
+	dh_gencontrol ${skip_packages} -- $(control_vars)
 
 
 override_dh_auto_clean:

From 4d5cf64dc4d31c57bf6216ca013444ee184fcb70 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 3 Mar 2024 11:55:23 +0100
Subject: [PATCH 292/349] Update changelog

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index ed9bc4e1..2541ed5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ llvm-toolchain-17 (1:17.0.6-6) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Fix 32bit builds
+  * Export mxgot on mips64el
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 24 Jan 2024 13:29:35 +0100
 

From 0c8504c3b9ad128089df8c18698c8a3dac853604 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 3 Mar 2024 12:03:16 +0100
Subject: [PATCH 293/349] From Steve Langasek, rename packages for time64_t
 transition

---
 debian/changelog                              |  7 ++
 debian/control                                | 96 +++++++++++--------
 debian/control.in                             | 96 +++++++++++--------
 debian/libc++1-X.Y.lintian-overrides.in       |  1 -
 ...Y.install.in => libc++1-X.Yt64.install.in} |  0
 ...1-X.Y.links.in => libc++1-X.Yt64.links.in} |  0
 debian/libc++1-X.Yt64.lintian-overrides.in    |  2 +
 debian/libc++abi1-X.Y.lintian-overrides.in    |  1 -
 ...nstall.in => libc++abi1-X.Yt64.install.in} |  0
 ....Y.links.in => libc++abi1-X.Yt64.links.in} |  0
 debian/libc++abi1-X.Yt64.lintian-overrides.in |  2 +
 ...stall.in => libclang-cppX.Yt64.install.in} |  0
 ...Y.links.in => libclang-cppX.Yt64.links.in} |  0
 .../libclang-cppX.Yt64.lintian-overrides.in   |  1 +
 debian/libclang1-X.Y.lintian-overrides.in     |  5 -
 ...install.in => libclang1-X.Yt64.install.in} |  0
 ...X.Y.links.in => libclang1-X.Yt64.links.in} |  0
 debian/libclang1-X.Yt64.lintian-overrides.in  |  6 ++
 ...symbols.in => libclang1-X.Yt64.symbols.in} |  2 +-
 debian/liblldb-X.Y.lintian-overrides.in       |  5 -
 ...Y.install.in => liblldb-X.Yt64.install.in} |  0
 ...b-X.Y.links.in => liblldb-X.Yt64.links.in} |  0
 debian/liblldb-X.Yt64.lintian-overrides.in    |  6 ++
 debian/libllvmX.Y.lintian-overrides.in        |  2 -
 ....Y.install.in => libllvmX.Yt64.install.in} |  0
 ...lvmX.Y.links.in => libllvmX.Yt64.links.in} |  0
 debian/libllvmX.Yt64.lintian-overrides.in     |  3 +
 debian/libmlir-X.Y.lintian-overrides.in       |  1 -
 ...Y.install.in => libmlir-X.Yt64.install.in} |  0
 debian/libmlir-X.Yt64.lintian-overrides.in    |  2 +
 debian/libomp5-X.Y.lintian-overrides.in       |  1 -
 ...Y.install.in => libomp5-X.Yt64.install.in} |  0
 ...5-X.Y.links.in => libomp5-X.Yt64.links.in} |  0
 debian/libomp5-X.Yt64.lintian-overrides.in    |  2 +
 ...Y.symbols.in => libomp5-X.Yt64.symbols.in} |  2 +-
 debian/libunwind-X.Y.lintian-overrides.in     |  1 -
 ...install.in => libunwind-X.Yt64.install.in} |  0
 ...X.Y.links.in => libunwind-X.Yt64.links.in} |  0
 debian/libunwind-X.Yt64.lintian-overrides.in  |  2 +
 debian/rules                                  | 18 ++--
 40 files changed, 154 insertions(+), 110 deletions(-)
 delete mode 100644 debian/libc++1-X.Y.lintian-overrides.in
 rename debian/{libc++1-X.Y.install.in => libc++1-X.Yt64.install.in} (100%)
 rename debian/{libc++1-X.Y.links.in => libc++1-X.Yt64.links.in} (100%)
 create mode 100644 debian/libc++1-X.Yt64.lintian-overrides.in
 delete mode 100644 debian/libc++abi1-X.Y.lintian-overrides.in
 rename debian/{libc++abi1-X.Y.install.in => libc++abi1-X.Yt64.install.in} (100%)
 rename debian/{libc++abi1-X.Y.links.in => libc++abi1-X.Yt64.links.in} (100%)
 create mode 100644 debian/libc++abi1-X.Yt64.lintian-overrides.in
 rename debian/{libclang-cppX.Y.install.in => libclang-cppX.Yt64.install.in} (100%)
 rename debian/{libclang-cppX.Y.links.in => libclang-cppX.Yt64.links.in} (100%)
 create mode 100644 debian/libclang-cppX.Yt64.lintian-overrides.in
 delete mode 100644 debian/libclang1-X.Y.lintian-overrides.in
 rename debian/{libclang1-X.Y.install.in => libclang1-X.Yt64.install.in} (100%)
 rename debian/{libclang1-X.Y.links.in => libclang1-X.Yt64.links.in} (100%)
 create mode 100644 debian/libclang1-X.Yt64.lintian-overrides.in
 rename debian/{libclang1-X.Y.symbols.in => libclang1-X.Yt64.symbols.in} (99%)
 delete mode 100644 debian/liblldb-X.Y.lintian-overrides.in
 rename debian/{liblldb-X.Y.install.in => liblldb-X.Yt64.install.in} (100%)
 rename debian/{liblldb-X.Y.links.in => liblldb-X.Yt64.links.in} (100%)
 create mode 100644 debian/liblldb-X.Yt64.lintian-overrides.in
 delete mode 100644 debian/libllvmX.Y.lintian-overrides.in
 rename debian/{libllvmX.Y.install.in => libllvmX.Yt64.install.in} (100%)
 rename debian/{libllvmX.Y.links.in => libllvmX.Yt64.links.in} (100%)
 create mode 100644 debian/libllvmX.Yt64.lintian-overrides.in
 delete mode 100644 debian/libmlir-X.Y.lintian-overrides.in
 rename debian/{libmlir-X.Y.install.in => libmlir-X.Yt64.install.in} (100%)
 create mode 100644 debian/libmlir-X.Yt64.lintian-overrides.in
 delete mode 100644 debian/libomp5-X.Y.lintian-overrides.in
 rename debian/{libomp5-X.Y.install.in => libomp5-X.Yt64.install.in} (100%)
 rename debian/{libomp5-X.Y.links.in => libomp5-X.Yt64.links.in} (100%)
 create mode 100644 debian/libomp5-X.Yt64.lintian-overrides.in
 rename debian/{libomp5-X.Y.symbols.in => libomp5-X.Yt64.symbols.in} (99%)
 delete mode 100644 debian/libunwind-X.Y.lintian-overrides.in
 rename debian/{libunwind-X.Y.install.in => libunwind-X.Yt64.install.in} (100%)
 rename debian/{libunwind-X.Y.links.in => libunwind-X.Yt64.links.in} (100%)
 create mode 100644 debian/libunwind-X.Yt64.lintian-overrides.in

diff --git a/debian/changelog b/debian/changelog
index e2aa6217..22592797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-16 (1:16.0.6-21) UNRELEASED; urgency=medium
+
+  [ Steve Langasek ]
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 03 Mar 2024 12:02:57 +0100
+
 llvm-toolchain-16 (1:16.0.6-20) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
diff --git a/debian/control b/debian/control
index 5dd3a460..aa8c1d5d 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang-common-16-dev (= ${binary:Version}),
  llvm-16-linker-tools (= ${binary:Version}),
- libclang1-16 (= ${binary:Version}), libc6-dev, binutils
+ libclang1-16t64 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-16-dev, python3
 # libomp-16-dev
@@ -77,7 +77,7 @@ Description: clang-based tools for C/C++ developments
 Package: clang-format-16
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm16 (= ${binary:Version})
+ libllvm16t64 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
  Clang-format is both a library and a stand-alone tool with the goal of
  automatically reformatting C++ sources files according to configurable
@@ -93,7 +93,7 @@ Description: Tool to format C/C++/Obj-C code
 Package: clang-tidy-16
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm16 (= ${binary:Version}), libclang-common-16-dev,
+ libllvm16t64 (= ${binary:Version}), libclang-common-16-dev,
  clang-tools-16, python3-yaml
 Description: clang-based C++ linter tool
  Provide an extensible framework for diagnosing and fixing typical programming
@@ -129,7 +129,10 @@ Description: C, C++ and Objective-C compiler - Documentation
  .
  This package contains the documentation.
 
-Package: libclang1-16
+Package: libclang1-16t64
+Provides: ${t64:Provides}
+Replaces: libclang1-16
+Breaks: libclang1-16 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -154,7 +157,7 @@ Package: libclang-16-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang1-16 (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang1-16t64 (= ${binary:Version}),
  libclang-common-16-dev (= ${binary:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -170,7 +173,7 @@ Description: Clang library - Development package
 Package: libclang-common-16-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16t64 (= ${binary:Version})
 Recommends: libclang-rt-16-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -239,10 +242,13 @@ Description: High-level loop and data-locality optimizer
 
 # ------------- clang libraries -------------
 
-Package: libclang-cpp16
+Package: libclang-cpp16t64
+Provides: ${t64:Provides}
+Replaces: libclang-cpp16
+Breaks: libclang-cpp16 (<< ${source:Version})
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -264,7 +270,7 @@ Package: libclang-cpp16-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-cpp16 (= ${binary:Version})
+ libclang-cpp16t64 (= ${binary:Version})
 # Move of libclang-cpp.so into libclang-cpp16.dev
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -340,7 +346,10 @@ Description: Clang examples
 
 # ------------- LLVM -------------
 
-Package: libllvm16
+Package: libllvm16t64
+Provides: ${t64:Provides}
+Replaces: libllvm16
+Breaks: libllvm16 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -416,8 +425,8 @@ Description: Modular compiler and toolchain technologies, IR interpreter
 Package: llvm-16-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
- llvm-16 (= ${binary:Version}), libllvm16 (= ${binary:Version}), libncurses-dev,
- llvm-16-tools (= ${binary:Version}), libclang-cpp16 (= ${binary:Version}),
+ llvm-16 (= ${binary:Version}), libllvm16t64 (= ${binary:Version}), libncurses-dev,
+ llvm-16-tools (= ${binary:Version}), libclang-cpp16t64 (= ${binary:Version}),
  libz3-dev, libxml2-dev
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
@@ -523,7 +532,7 @@ Description: Modular compiler and toolchain technologies, examples
 Package: lld-16
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -533,7 +542,7 @@ Description: LLVM-based linker
 Package: liblld-16
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: LLVM-based linker, library
@@ -563,7 +572,7 @@ Description: LLVM-based linker, header files
 Package: lldb-16
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16t64 (= ${binary:Version}),
  python3-lldb-16
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
@@ -571,10 +580,13 @@ Description: Next generation, high-performance debugger
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: liblldb-16
+Package: liblldb-16t64
+Provides: ${t64:Provides}
+Replaces: liblldb-16
+Breaks: liblldb-16 (<< ${source:Version})
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: Next generation, high-performance debugger, library
@@ -588,7 +600,7 @@ Package: python3-lldb-16
 Section: python
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-16 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-16t64 (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y
@@ -621,7 +633,7 @@ Description: Next generation, high-performance debugger, header files
 Package: libomp-16-dev
 Section: libdevel
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
-Depends: libomp5-16 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libomp5-16t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-16-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
 Provides: libomp-x.y-dev
@@ -632,14 +644,14 @@ Description: LLVM OpenMP runtime - dev package
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp5-16
+Package: libomp5-16t64
 Multi-Arch: same
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libomp5 (<< 44)
-Provides: libomp-x.y
+Breaks: libomp5-16 (<< ${source:Version}), libomp5 (<< 44)
+Provides: ${t64:Provides}, libomp-x.y
 Conflicts: libomp-x.y
-Replaces: libomp-x.y
+Replaces: libomp5-16, libomp-x.y
 Description: LLVM OpenMP runtime
  The runtime is the part of the OpenMP implementation that your code is
  linked against, and that manages the multiple threads in an OpenMP program
@@ -660,17 +672,17 @@ Description: LLVM OpenMP runtime - Documentation
 
 # ------------- libcxx -------------
 
-Package: libc++1-16
+Package: libc++1-16t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
-Breaks: libc++1 (<< 44)
-Provides: libc++-x.y
+Breaks: libc++1-16 (<< ${source:Version}), libc++1 (<< 44)
+Provides: ${t64:Provides}, libc++-x.y
 Conflicts: libc++-x.y
-Replaces: libc++-x.y
+Replaces: libc++1-16, libc++-x.y
 Description: LLVM C++ Standard library
  libc++ is another implementation of the C++ standard library.
  .
@@ -688,7 +700,7 @@ Package: libc++-16-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends},
+Depends: libc++1-16t64 (= ${binary:Version}), ${misc:Depends},
  libunwind-16-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
@@ -732,16 +744,16 @@ Description: LLVM C++ Standard library (WASI)
 
 # ------------- libcxxabi -------------
 
-Package: libc++abi1-16
+Package: libc++abi1-16t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libc++abi1 (<< 44)
-Provides: libc++abi-x.y
+Breaks: libc++abi1-16 (<< ${source:Version}), libc++abi1 (<< 44)
+Provides: ${t64:Provides}, libc++abi-x.y
 Conflicts: libc++abi-x.y
-Replaces: libc++abi-x.y
+Replaces: libc++abi1-16, libc++abi-x.y
 Description: LLVM low level support for a standard C++ library
  libc++abi is another implementation of low level support for a standard C++
  library.
@@ -755,7 +767,7 @@ Package: libc++abi-16-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++abi1-16 (= ${binary:Version}), ${misc:Depends}
+Depends: libc++abi1-16t64 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++abi-dev (<= 44)
 Provides: libc++abi-x.y-dev
 Conflicts: libc++abi-x.y-dev
@@ -827,15 +839,16 @@ Description: OpenCL C language implementation - development files
 
 # ------------- libunwind -------------
 
-Package: libunwind-16
+Package: libunwind-16t64
+Breaks: libunwind-16 (<< ${source:Version})
 Section: libs
 Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libunwind-x.y
+Provides: ${t64:Provides}, libunwind-x.y
 Conflicts: libunwind-x.y
-Replaces: libunwind-x.y
+Replaces: libunwind-16, libunwind-x.y
 Description: production-quality unwinder
  libunwind is a production-quality unwinder, with platform support for DWARF
  unwind info, SjLj, and ARM EHABI.
@@ -850,7 +863,7 @@ Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libunwind-16 (= ${binary:Version})
+ libunwind-16t64 (= ${binary:Version})
 Provides: libunwind-dev, libunwind-x.y-dev
 Conflicts: libunwind-dev, libunwind-x.y-dev
 Replaces: libunwind-dev, libunwind-x.y-dev
@@ -875,15 +888,16 @@ Description: Multi-Level Intermediate Representation tools
  .
  This package provides tools.
 
-Package: libmlir-16
+Package: libmlir-16t64
+Breaks: libmlir-16 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libmlir-x.y
+Provides: ${t64:Provides}, libmlir-x.y
 Conflicts: libmlir-x.y
-Replaces: libmlir-x.y
+Replaces: libmlir-16, libmlir-x.y
 Description: Multi-Level Intermediate Representation library
  Novel approach to building reusable and extensible compiler infrastructure.
  MLIR aims to address software fragmentation, improve compilation for
@@ -897,7 +911,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libmlir-16 (= ${binary:Version})
+ libmlir-16t64 (= ${binary:Version})
 Breaks: libmlir-dev
 Provides: libmlir-x.y-dev
 Conflicts: libmlir-x.y-dev
diff --git a/debian/control.in b/debian/control.in
index fbcb2ab8..0cf5a2c7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -47,7 +47,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
- libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
+ libclang1-@LLVM_VERSION@t64 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-@LLVM_VERSION@-dev, python3
 # libomp-@LLVM_VERSION@-dev
@@ -77,7 +77,7 @@ Description: clang-based tools for C/C++ developments
 Package: clang-format-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm@LLVM_VERSION@ (= ${binary:Version})
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
  Clang-format is both a library and a stand-alone tool with the goal of
  automatically reformatting C++ sources files according to configurable
@@ -93,7 +93,7 @@ Description: Tool to format C/C++/Obj-C code
 Package: clang-tidy-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- libllvm@LLVM_VERSION@ (= ${binary:Version}), libclang-common-@LLVM_VERSION@-dev,
+ libllvm@LLVM_VERSION@t64 (= ${binary:Version}), libclang-common-@LLVM_VERSION@-dev,
  clang-tools-@LLVM_VERSION@, python3-yaml
 Description: clang-based C++ linter tool
  Provide an extensible framework for diagnosing and fixing typical programming
@@ -129,7 +129,10 @@ Description: C, C++ and Objective-C compiler - Documentation
  .
  This package contains the documentation.
 
-Package: libclang1-@LLVM_VERSION@
+Package: libclang1-@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: libclang1-@LLVM_VERSION@
+Breaks: libclang1-@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -154,7 +157,7 @@ Package: libclang-@LLVM_VERSION@-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@ (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@t64 (= ${binary:Version}),
  libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -170,7 +173,7 @@ Description: Clang library - Development package
 Package: libclang-common-@LLVM_VERSION@-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Recommends: libclang-rt-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -239,10 +242,13 @@ Description: High-level loop and data-locality optimizer
 
 # ------------- clang libraries -------------
 
-Package: libclang-cpp@LLVM_VERSION@
+Package: libclang-cpp@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: libclang-cpp@LLVM_VERSION@
+Breaks: libclang-cpp@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -264,7 +270,7 @@ Package: libclang-cpp@LLVM_VERSION@-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- libclang-cpp@LLVM_VERSION@ (= ${binary:Version})
+ libclang-cpp@LLVM_VERSION@t64 (= ${binary:Version})
 # Move of libclang-cpp.so into libclang-cpp@LLVM_VERSION@.dev
 Description: C++ interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -340,7 +346,10 @@ Description: Clang examples
 
 # ------------- LLVM -------------
 
-Package: libllvm@LLVM_VERSION@
+Package: libllvm@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: libllvm@LLVM_VERSION@
+Breaks: libllvm@LLVM_VERSION@ (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -416,8 +425,8 @@ Description: Modular compiler and toolchain technologies, IR interpreter
 Package: llvm-@LLVM_VERSION@-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
- llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@ (= ${binary:Version}), libncurses-dev,
- llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@ (= ${binary:Version}),
+ llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@t64 (= ${binary:Version}), libncurses-dev,
+ llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@t64 (= ${binary:Version}),
  libz3-dev, libxml2-dev
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
@@ -523,7 +532,7 @@ Description: Modular compiler and toolchain technologies, examples
 Package: lld-@LLVM_VERSION@
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -533,7 +542,7 @@ Description: LLVM-based linker
 Package: liblld-@LLVM_VERSION@
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64
 # ia64 hurd powerpc have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: LLVM-based linker, library
@@ -563,7 +572,7 @@ Description: LLVM-based linker, header files
 Package: lldb-@LLVM_VERSION@
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
  python3-lldb-@LLVM_VERSION@
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
@@ -571,10 +580,13 @@ Description: Next generation, high-performance debugger
  reusable components which highly leverage existing libraries in the larger LLVM
  Project, such as the Clang expression parser and LLVM disassembler.
 
-Package: liblldb-@LLVM_VERSION@
+Package: liblldb-@LLVM_VERSION@t64
+Provides: ${t64:Provides}
+Replaces: liblldb-@LLVM_VERSION@
+Breaks: liblldb-@LLVM_VERSION@ (<< ${source:Version})
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Description: Next generation, high-performance debugger, library
@@ -588,7 +600,7 @@ Package: python3-lldb-@LLVM_VERSION@
 Section: python
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@t64 (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
 Provides: python3-lldb-x.y
@@ -621,7 +633,7 @@ Description: Next generation, high-performance debugger, header files
 Package: libomp-@LLVM_VERSION@-dev
 Section: libdevel
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
-Depends: libomp5-@LLVM_VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libomp5-@LLVM_VERSION@t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-@LLVM_VERSION@-doc
 Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
 Provides: libomp-x.y-dev
@@ -632,14 +644,14 @@ Description: LLVM OpenMP runtime - dev package
  linked against, and that manages the multiple threads in an OpenMP program
  while it is executing.
 
-Package: libomp5-@LLVM_VERSION@
+Package: libomp5-@LLVM_VERSION@t64
 Multi-Arch: same
 Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libomp5 (<< 44)
-Provides: libomp-x.y
+Breaks: libomp5-@LLVM_VERSION@ (<< ${source:Version}), libomp5 (<< 44)
+Provides: ${t64:Provides}, libomp-x.y
 Conflicts: libomp-x.y
-Replaces: libomp-x.y
+Replaces: libomp5-@LLVM_VERSION@, libomp-x.y
 Description: LLVM OpenMP runtime
  The runtime is the part of the OpenMP implementation that your code is
  linked against, and that manages the multiple threads in an OpenMP program
@@ -660,17 +672,17 @@ Description: LLVM OpenMP runtime - Documentation
 
 # ------------- libcxx -------------
 
-Package: libc++1-@LLVM_VERSION@
+Package: libc++1-@LLVM_VERSION@t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
-Breaks: libc++1 (<< 44)
-Provides: libc++-x.y
+Breaks: libc++1-@LLVM_VERSION@ (<< ${source:Version}), libc++1 (<< 44)
+Provides: ${t64:Provides}, libc++-x.y
 Conflicts: libc++-x.y
-Replaces: libc++-x.y
+Replaces: libc++1-@LLVM_VERSION@, libc++-x.y
 Description: LLVM C++ Standard library
  libc++ is another implementation of the C++ standard library.
  .
@@ -688,7 +700,7 @@ Package: libc++-@LLVM_VERSION@-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends},
+Depends: libc++1-@LLVM_VERSION@t64 (= ${binary:Version}), ${misc:Depends},
  libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
@@ -732,16 +744,16 @@ Description: LLVM C++ Standard library (WASI)
 
 # ------------- libcxxabi -------------
 
-Package: libc++abi1-@LLVM_VERSION@
+Package: libc++abi1-@LLVM_VERSION@t64
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libc++abi1 (<< 44)
-Provides: libc++abi-x.y
+Breaks: libc++abi1-@LLVM_VERSION@ (<< ${source:Version}), libc++abi1 (<< 44)
+Provides: ${t64:Provides}, libc++abi-x.y
 Conflicts: libc++abi-x.y
-Replaces: libc++abi-x.y
+Replaces: libc++abi1-@LLVM_VERSION@, libc++abi-x.y
 Description: LLVM low level support for a standard C++ library
  libc++abi is another implementation of low level support for a standard C++
  library.
@@ -755,7 +767,7 @@ Package: libc++abi-@LLVM_VERSION@-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libc++abi1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}
+Depends: libc++abi1-@LLVM_VERSION@t64 (= ${binary:Version}), ${misc:Depends}
 Breaks: libc++abi-dev (<= 44)
 Provides: libc++abi-x.y-dev
 Conflicts: libc++abi-x.y-dev
@@ -827,15 +839,16 @@ Description: OpenCL C language implementation - development files
 
 # ------------- libunwind -------------
 
-Package: libunwind-@LLVM_VERSION@
+Package: libunwind-@LLVM_VERSION@t64
+Breaks: libunwind-@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libunwind-x.y
+Provides: ${t64:Provides}, libunwind-x.y
 Conflicts: libunwind-x.y
-Replaces: libunwind-x.y
+Replaces: libunwind-@LLVM_VERSION@, libunwind-x.y
 Description: production-quality unwinder
  libunwind is a production-quality unwinder, with platform support for DWARF
  unwind info, SjLj, and ARM EHABI.
@@ -850,7 +863,7 @@ Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libunwind-@LLVM_VERSION@ (= ${binary:Version})
+ libunwind-@LLVM_VERSION@t64 (= ${binary:Version})
 Provides: libunwind-dev, libunwind-x.y-dev
 Conflicts: libunwind-dev, libunwind-x.y-dev
 Replaces: libunwind-dev, libunwind-x.y-dev
@@ -875,15 +888,16 @@ Description: Multi-Level Intermediate Representation tools
  .
  This package provides tools.
 
-Package: libmlir-@LLVM_VERSION@
+Package: libmlir-@LLVM_VERSION@t64
+Breaks: libmlir-@LLVM_VERSION@ (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Provides: libmlir-x.y
+Provides: ${t64:Provides}, libmlir-x.y
 Conflicts: libmlir-x.y
-Replaces: libmlir-x.y
+Replaces: libmlir-@LLVM_VERSION@, libmlir-x.y
 Description: Multi-Level Intermediate Representation library
  Novel approach to building reusable and extensible compiler infrastructure.
  MLIR aims to address software fragmentation, improve compilation for
@@ -897,7 +911,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libmlir-@LLVM_VERSION@ (= ${binary:Version})
+ libmlir-@LLVM_VERSION@t64 (= ${binary:Version})
 Breaks: libmlir-dev
 Provides: libmlir-x.y-dev
 Conflicts: libmlir-x.y-dev
diff --git a/debian/libc++1-X.Y.lintian-overrides.in b/debian/libc++1-X.Y.lintian-overrides.in
deleted file mode 100644
index 8e1532d4..00000000
--- a/debian/libc++1-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libc++1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0*
diff --git a/debian/libc++1-X.Y.install.in b/debian/libc++1-X.Yt64.install.in
similarity index 100%
rename from debian/libc++1-X.Y.install.in
rename to debian/libc++1-X.Yt64.install.in
diff --git a/debian/libc++1-X.Y.links.in b/debian/libc++1-X.Yt64.links.in
similarity index 100%
rename from debian/libc++1-X.Y.links.in
rename to debian/libc++1-X.Yt64.links.in
diff --git a/debian/libc++1-X.Yt64.lintian-overrides.in b/debian/libc++1-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..25a325fa
--- /dev/null
+++ b/debian/libc++1-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libc++1-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0*
+libc++1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libc++1-@LLVM_VERSION@
diff --git a/debian/libc++abi1-X.Y.lintian-overrides.in b/debian/libc++abi1-X.Y.lintian-overrides.in
deleted file mode 100644
index 0637b505..00000000
--- a/debian/libc++abi1-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libc++abi1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0*
diff --git a/debian/libc++abi1-X.Y.install.in b/debian/libc++abi1-X.Yt64.install.in
similarity index 100%
rename from debian/libc++abi1-X.Y.install.in
rename to debian/libc++abi1-X.Yt64.install.in
diff --git a/debian/libc++abi1-X.Y.links.in b/debian/libc++abi1-X.Yt64.links.in
similarity index 100%
rename from debian/libc++abi1-X.Y.links.in
rename to debian/libc++abi1-X.Yt64.links.in
diff --git a/debian/libc++abi1-X.Yt64.lintian-overrides.in b/debian/libc++abi1-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..c3100c96
--- /dev/null
+++ b/debian/libc++abi1-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libc++abi1-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0*
+libc++abi1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libc++abi1-@LLVM_VERSION@
diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Yt64.install.in
similarity index 100%
rename from debian/libclang-cppX.Y.install.in
rename to debian/libclang-cppX.Yt64.install.in
diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Yt64.links.in
similarity index 100%
rename from debian/libclang-cppX.Y.links.in
rename to debian/libclang-cppX.Yt64.links.in
diff --git a/debian/libclang-cppX.Yt64.lintian-overrides.in b/debian/libclang-cppX.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..5d4a86a8
--- /dev/null
+++ b/debian/libclang-cppX.Yt64.lintian-overrides.in
@@ -0,0 +1 @@
+libclang-cpp@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang-cpp@LLVM_VERSION@
diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in
deleted file mode 100644
index 86038455..00000000
--- a/debian/libclang1-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# I know and I am not planning to change that yet.
-libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang-@LLVM_VERSION@-1
-# Provided as transition
-libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so
-libclang1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so
diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Yt64.install.in
similarity index 100%
rename from debian/libclang1-X.Y.install.in
rename to debian/libclang1-X.Yt64.install.in
diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Yt64.links.in
similarity index 100%
rename from debian/libclang1-X.Y.links.in
rename to debian/libclang1-X.Yt64.links.in
diff --git a/debian/libclang1-X.Yt64.lintian-overrides.in b/debian/libclang1-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..c0e016cc
--- /dev/null
+++ b/debian/libclang1-X.Yt64.lintian-overrides.in
@@ -0,0 +1,6 @@
+# I know and I am not planning to change that yet.
+libclang1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang-@LLVM_VERSION@-1
+# Provided as transition
+libclang1-@LLVM_VERSION@t64: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so
+libclang1-@LLVM_VERSION@t64: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so
+libclang1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@
diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Yt64.symbols.in
similarity index 99%
rename from debian/libclang1-X.Y.symbols.in
rename to debian/libclang1-X.Yt64.symbols.in
index 9d6e9d20..d91146a7 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Yt64.symbols.in
@@ -1,4 +1,4 @@
-libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER#
+libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@t64 #MINVER#
  (optional)LLVM_13@LLVM_13 1:15.0.7-3
  (optional)LLVM_16@LLVM_16 1:16.0.2-1
  clang_BlockCommandComment_getArgText@LLVM_13 1:5.0~svn298832-1~
diff --git a/debian/liblldb-X.Y.lintian-overrides.in b/debian/liblldb-X.Y.lintian-overrides.in
deleted file mode 100644
index 180aec35..00000000
--- a/debian/liblldb-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# That is normal. The lib is not (yet?) shipped as a new package
-liblldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@-1
-# For now, override this warning. We might create a -dev at some point
-liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
-liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-@LLVM_VERSION@.so.1 usr/lib/*/liblldb-@LLVM_VERSION@.so
diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Yt64.install.in
similarity index 100%
rename from debian/liblldb-X.Y.install.in
rename to debian/liblldb-X.Yt64.install.in
diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Yt64.links.in
similarity index 100%
rename from debian/liblldb-X.Y.links.in
rename to debian/liblldb-X.Yt64.links.in
diff --git a/debian/liblldb-X.Yt64.lintian-overrides.in b/debian/liblldb-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..02752489
--- /dev/null
+++ b/debian/liblldb-X.Yt64.lintian-overrides.in
@@ -0,0 +1,6 @@
+# That is normal. The lib is not (yet?) shipped as a new package
+liblldb-@LLVM_VERSION@t64: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@t64-1
+# For now, override this warning. We might create a -dev at some point
+liblldb-@LLVM_VERSION@t64: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so
+liblldb-@LLVM_VERSION@t64: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-@LLVM_VERSION@t64.so.1 usr/lib/*/liblldb-@LLVM_VERSION@t64.so
+liblldb-@LLVM_VERSION@t64: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@
diff --git a/debian/libllvmX.Y.lintian-overrides.in b/debian/libllvmX.Y.lintian-overrides.in
deleted file mode 100644
index 49f7ef24..00000000
--- a/debian/libllvmX.Y.lintian-overrides.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# That is normal. Upstream does not match the debian convention
-libllvm@LLVM_VERSION@: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1
diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Yt64.install.in
similarity index 100%
rename from debian/libllvmX.Y.install.in
rename to debian/libllvmX.Yt64.install.in
diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Yt64.links.in
similarity index 100%
rename from debian/libllvmX.Y.links.in
rename to debian/libllvmX.Yt64.links.in
diff --git a/debian/libllvmX.Yt64.lintian-overrides.in b/debian/libllvmX.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..40fd72df
--- /dev/null
+++ b/debian/libllvmX.Yt64.lintian-overrides.in
@@ -0,0 +1,3 @@
+# That is normal. Upstream does not match the debian convention
+libllvm@LLVM_VERSION@t64: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1
+libllvm@LLVM_VERSION@t64: package-name-doesnt-match-sonames libllvm@LLVM_VERSION@
diff --git a/debian/libmlir-X.Y.lintian-overrides.in b/debian/libmlir-X.Y.lintian-overrides.in
deleted file mode 100644
index f2f020ba..00000000
--- a/debian/libmlir-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libmlir-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/*
diff --git a/debian/libmlir-X.Y.install.in b/debian/libmlir-X.Yt64.install.in
similarity index 100%
rename from debian/libmlir-X.Y.install.in
rename to debian/libmlir-X.Yt64.install.in
diff --git a/debian/libmlir-X.Yt64.lintian-overrides.in b/debian/libmlir-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..50568c40
--- /dev/null
+++ b/debian/libmlir-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libmlir-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/*
+libmlir-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libmlir-@LLVM_VERSION@
diff --git a/debian/libomp5-X.Y.lintian-overrides.in b/debian/libomp5-X.Y.lintian-overrides.in
deleted file mode 100644
index 335e58e9..00000000
--- a/debian/libomp5-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libomp5-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5*
diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Yt64.install.in
similarity index 100%
rename from debian/libomp5-X.Y.install.in
rename to debian/libomp5-X.Yt64.install.in
diff --git a/debian/libomp5-X.Y.links.in b/debian/libomp5-X.Yt64.links.in
similarity index 100%
rename from debian/libomp5-X.Y.links.in
rename to debian/libomp5-X.Yt64.links.in
diff --git a/debian/libomp5-X.Yt64.lintian-overrides.in b/debian/libomp5-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..0bbf0689
--- /dev/null
+++ b/debian/libomp5-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libomp5-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5*
+libomp5-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libomp5-@LLVM_VERSION@
diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Yt64.symbols.in
similarity index 99%
rename from debian/libomp5-X.Y.symbols.in
rename to debian/libomp5-X.Yt64.symbols.in
index 15295c9f..350fcf19 100644
--- a/debian/libomp5-X.Y.symbols.in
+++ b/debian/libomp5-X.Yt64.symbols.in
@@ -1,4 +1,4 @@
-libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
+libomp.so.5 libomp5-@LLVM_VERSION@t64 #MINVER#
  GOMP_1.0@GOMP_1.0 0.20131209
  GOMP_2.0@GOMP_2.0 0.20131209
  GOMP_3.0@GOMP_3.0 0.20131209
diff --git a/debian/libunwind-X.Y.lintian-overrides.in b/debian/libunwind-X.Y.lintian-overrides.in
deleted file mode 100644
index 6cb74223..00000000
--- a/debian/libunwind-X.Y.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-libunwind-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0*
diff --git a/debian/libunwind-X.Y.install.in b/debian/libunwind-X.Yt64.install.in
similarity index 100%
rename from debian/libunwind-X.Y.install.in
rename to debian/libunwind-X.Yt64.install.in
diff --git a/debian/libunwind-X.Y.links.in b/debian/libunwind-X.Yt64.links.in
similarity index 100%
rename from debian/libunwind-X.Y.links.in
rename to debian/libunwind-X.Yt64.links.in
diff --git a/debian/libunwind-X.Yt64.lintian-overrides.in b/debian/libunwind-X.Yt64.lintian-overrides.in
new file mode 100644
index 00000000..3683dc8c
--- /dev/null
+++ b/debian/libunwind-X.Yt64.lintian-overrides.in
@@ -0,0 +1,2 @@
+libunwind-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0*
+libunwind-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libunwind-@LLVM_VERSION@
diff --git a/debian/rules b/debian/rules
index 79ac1d6f..e6f6f311 100755
--- a/debian/rules
+++ b/debian/rules
@@ -571,7 +571,7 @@ preconfigure:
 		debian/libclang-rt-$(LLVM_VERSION)-dev.install \
 		debian/libpolly-$(LLVM_VERSION)-dev.install \
 		debian/libomp-$(LLVM_VERSION)-dev.install \
-		debian/libomp5-$(LLVM_VERSION).install \
+		debian/libomp5-$(LLVM_VERSION)t64.install \
 		debian/llvm-$(LLVM_VERSION)-dev.install \
 		debian/llvm-$(LLVM_VERSION)-linker-tools.install \
 		debian/llvm-$(LLVM_VERSION)-linker-tools.links \
@@ -1223,10 +1223,10 @@ endif
 
 
 override_dh_makeshlibs:
-	dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION)
-	dh_makeshlibs -pliblldb-$(LLVM_VERSION)
-	dh_makeshlibs -plibllvm$(LLVM_VERSION)
-	dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION)
+	dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION)t64
+	dh_makeshlibs -pliblldb-$(LLVM_VERSION)t64
+	dh_makeshlibs -plibllvm$(LLVM_VERSION)t64
+	dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64
 	dh_makeshlibs --remaining-packages -V
 
 override_dh_shlibdeps:
@@ -1247,10 +1247,10 @@ override_dh_strip:
 	find $(TARGET_BUILD) -name '*.o' -o -name '*.a' -type f | xargs -r rm -f
 ifeq (0, $(strip $(shell dpkg --compare-versions $(DH_VERSION) ge 9.20160114; echo $$?)))
 	: # If we don't have the right version of debhelper, don't run the option
-	dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg'
-	dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg'
-	dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg'
-	dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg'
+	dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION)t64 --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)t64-dbg'
+	dh_strip -p libllvm$(LLVM_VERSION)t64 --dbgsym-migration='libllvm$(LLVM_VERSION)t64-dbg'
+	dh_strip -p liblldb-$(LLVM_VERSION)t64 --dbgsym-migration='liblldb-$(LLVM_VERSION)t64-dbg'
+	dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64 --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64-dbg'
 endif
 # ifeq (${LLD_ENABLE},yes)
 # 	PATH=$(CURDIR)/:$$PATH dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg

From c2764fa0c241809af3da926e0bf1d473ffb30eb0 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 3 Mar 2024 11:54:05 +0100
Subject: [PATCH 294/349] Disable compiler-rt on 32bit architectures except
 i386

---
 debian/rules | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index e6f6f311..08635e55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 # polly & lldb aren't enabled for every platform
 PROJECTS = clang;clang-tools-extra;lld;cross-project-tests;mlir
 # openmp & libunwind aren't enabled for every platform
-RUNTIMES = compiler-rt;libcxx;libcxxabi
 
 TARGET_BUILD	:= build-llvm
 TARGET_BUILD_STAGE2    := $(TARGET_BUILD)/tools/clang/stage2-bins
@@ -20,6 +19,20 @@ ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL))
 	LLVM_VERSION_FULL := $(LLVM_VERSION).0.0
 endif
 
+# dpkg-buildflags support
+# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
+export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
+ifeq ($(DEB_HOST_ARCH),i386)
+  RUNTIMES = compiler-rt;libcxx;libcxxabi
+else
+  ifeq ($(DEB_HOST_ARCH_BITS),32)
+    RUNTIMES = libcxx;libcxxabi
+    skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev
+  else
+    RUNTIMES = compiler-rt;libcxx;libcxxabi
+  endif
+endif
+
 SOURCE_NAME := $(shell dpkg-parsechangelog -S Source)
 ifneq (,$(findstring snapshot,$(SOURCE_NAME)))
   BRANCH_NAME=snapshot
@@ -46,9 +59,6 @@ include /usr/share/dpkg/architecture.mk
 
 CONFIGURE_EXTRA =
 
-# dpkg-buildflags support
-# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
-export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
 # these are handled on a per stage / build basis
 export DEB_CFLAGS_MAINT_STRIP = -g -O2
 export DEB_CXXFLAGS_MAINT_STRIP = -g -O2
@@ -1038,7 +1048,7 @@ override_dh_auto_install:
 ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64))
 ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 	# To fix custom-library-search-path
-	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so
+	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so || true
 endif
 endif
 
@@ -1289,7 +1299,7 @@ else
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
 endif
 endif
-	dh_install --fail-missing
+	dh_install --fail-missing ${skip_packages}
 # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages
 # These packages are arch: all, so only do so when the packages are built
 ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(shell dh_listpackages)))
@@ -1417,8 +1427,11 @@ override_dh_auto_test:
 endif
 
 
+override_dh_builddeb:
+	dh_builddeb ${skip_packages}
+
 override_dh_gencontrol: sccache-stats
-	dh_gencontrol -- $(control_vars)
+	dh_gencontrol ${skip_packages} -- $(control_vars)
 
 
 override_dh_auto_clean:

From f604a3d48b2f2b7138818f79b66b1b05a3e6c988 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 3 Mar 2024 12:06:25 +0100
Subject: [PATCH 295/349] Update changelog

---
 debian/changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 22592797..a2a6aca8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-llvm-toolchain-16 (1:16.0.6-21) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-21) unstable; urgency=medium
 
   [ Steve Langasek ]
   * Rename libraries for 64-bit time_t transition.
 
+   [ Gianfranco Costamagna ]
+   * Fix 32bit builds
+
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 03 Mar 2024 12:02:57 +0100
 
 llvm-toolchain-16 (1:16.0.6-20) unstable; urgency=medium

From 02034b1a690fa3234b7959a60b33edc197e2f5c2 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Mon, 4 Mar 2024 09:07:59 +0100
Subject: [PATCH 296/349] Fix mxgot export on mips64el

---
 debian/rules | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0754c670..7fdf78f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,11 +32,6 @@ else
     skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev
   else
     RUNTIMES = compiler-rt;libcxx;libcxxabi
-    ifeq ($(DEB_HOST_ARCH),mips64el)
-      export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong
-      CFLAGS_EXTRA += -mxgot
-      CXXFLAGS_EXTRA += -mxgot
-    endif
   endif
 endif
 
@@ -219,6 +214,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
 # avoid an issue with search path on mips64el
 # https://bugs.llvm.org/show_bug.cgi?id=41204
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64
+  CFLAGS_EXTRA += -mxgot
+  CXXFLAGS_EXTRA += -mxgot
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),powerpc))

From e336d3af61a67aab54f4b949c3e3595e9a909dfd Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Mon, 4 Mar 2024 16:10:31 +0100
Subject: [PATCH 297/349] Reupload to sid

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2541ed5f..21c78955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium
+
+  * Fix mxgot export on mips64el
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 04 Mar 2024 16:09:18 +0100
+
 llvm-toolchain-17 (1:17.0.6-6) unstable; urgency=medium
 
   [ chenli ]

From 4fde42011eaf9ead63002ff2af96fc3f334ba12d Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 5 Mar 2024 10:18:06 +0100
Subject: [PATCH 298/349] Disable tests on mips64el

---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7fdf78f6..3ec6c28d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -379,8 +379,8 @@ ifeq (riscv64,$(DEB_HOST_ARCH))
 endif
 endif
 
-# llvm tests timeout, disable it on mipsel
-ifeq (mipsel,$(DEB_HOST_ARCH))
+# llvm tests timeout, disable it on mips64el
+ifeq (mips64el,$(DEB_HOST_ARCH))
 	RUN_TEST=no
 endif
 

From 0e82ff5822da25f3ba94bb6e58e081a3fc9e828c Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 5 Mar 2024 10:18:06 +0100
Subject: [PATCH 299/349] Disable tests on mips64el

---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 08635e55..f7b8828c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -365,8 +365,8 @@ ifeq (riscv64,$(DEB_HOST_ARCH))
 endif
 endif
 
-# llvm tests timeout, disable it on mipsel
-ifeq (mipsel,$(DEB_HOST_ARCH))
+# llvm tests timeout, disable it on mips64el
+ifeq (mips64el,$(DEB_HOST_ARCH))
 	RUN_TEST=no
 endif
 

From 32497f066efc7e4590260bbf08bba90bb259b2da Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 5 Mar 2024 23:43:58 +0100
Subject: [PATCH 300/349]   * Make libclang-common-17-dev architecture
 dependent.

---
 debian/changelog  |  6 ++++++
 debian/control    | 10 +++++-----
 debian/control.in | 10 +++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21c78955..4d578922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
+
+  * Make libclang-common-17-dev architecture dependent.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 05 Mar 2024 23:42:57 +0100
+
 llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium
 
   * Fix mxgot export on mips64el
diff --git a/debian/control b/debian/control
index d7551988..a3b0b67f 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc},
  libllvm17t64 (= ${binary:Version}),
- libclang-common-17-dev (= ${source:Version}),
+ libclang-common-17-dev (= ${binary:Version}),
  llvm-17-linker-tools (= ${binary:Version}),
  libclang1-17t64 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -95,7 +95,7 @@ Package: clang-tidy-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
  libllvm17t64 (= ${binary:Version}),
- libclang-common-17-dev (= ${source:Version}),
+ libclang-common-17-dev (= ${binary:Version}),
  clang-tools-17, python3-yaml
 Description: clang-based C++ linter tool
  Provide an extensible framework for diagnosing and fixing typical programming
@@ -162,7 +162,7 @@ Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang1-17t64 (= ${binary:Version}),
- libclang-common-17-dev (= ${source:Version})
+ libclang-common-17-dev (= ${binary:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -175,8 +175,8 @@ Description: Clang library - Development package
  libclang1-17.
 
 Package: libclang-common-17-dev
-Architecture: all
-Multi-Arch: foreign
+Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends},
 Recommends: libclang-rt-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)
diff --git a/debian/control.in b/debian/control.in
index 94eb46f7..b13dcb86 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -46,7 +46,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc},
  libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
- libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
+ libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
  libclang1-@LLVM_VERSION@t64 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -95,7 +95,7 @@ Package: clang-tidy-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
  libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
- libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
+ libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
  clang-tools-@LLVM_VERSION@, python3-yaml
 Description: clang-based C++ linter tool
  Provide an extensible framework for diagnosing and fixing typical programming
@@ -162,7 +162,7 @@ Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@t64 (= ${binary:Version}),
- libclang-common-@LLVM_VERSION@-dev (= ${source:Version})
+ libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -175,8 +175,8 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: all
-Multi-Arch: foreign
+Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends},
 Recommends: libclang-rt-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1)

From 0d959c73cd4f5de08106b7167c9b1272d35c3d4c Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Tue, 5 Mar 2024 21:18:12 -0700
Subject: [PATCH 301/349] Fix unwind detection logic when compiler-rt is
 disabled

---
 debian/changelog                              |  7 ++++
 .../patches/fix-unwind-detection-logic.patch  | 39 +++++++++++++++++++
 debian/patches/series                         |  2 +-
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/fix-unwind-detection-logic.patch

diff --git a/debian/changelog b/debian/changelog
index 4d578922..e5f9b334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-17 (1:17.0.6-9) UNRELEASED; urgency=medium
+
+  * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
+    libunwind detection logic when compiler-rt is disabled.
+
+ -- Zixing Liu <zixing.liu@canonical.com>  Tue, 05 Mar 2024 21:17:18 -0700
+
 llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
 
   * Make libclang-common-17-dev architecture dependent.
diff --git a/debian/patches/fix-unwind-detection-logic.patch b/debian/patches/fix-unwind-detection-logic.patch
new file mode 100644
index 00000000..667432c3
--- /dev/null
+++ b/debian/patches/fix-unwind-detection-logic.patch
@@ -0,0 +1,39 @@
+From 7c5e4e5fa3a948fc662be3a6bf057021d32f72e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+Date: Thu, 5 Oct 2023 11:41:11 +0300
+Subject: [PATCH] Reapply [compiler-rt] Check for and use -lunwind when linking
+ with -nodefaultlibs (#66584)
+
+If libc++ is available and should be used as the ubsan C++ ABI library,
+the check for libc++ might fail if libc++ is a static library, as the
+-nodefaultlibs flag inhibits a potential compiler default -lunwind.
+
+Just like the -nodefaultlibs configuration tests for and manually adds a
+bunch of compiler default libraries, look for -lunwind too.
+
+This is a reland of #65912.
+---
+ compiler-rt/cmake/config-ix.cmake | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
+index 09a9b62ce4cd37..a8e078f1ebc988 100644
+--- a/compiler-rt/cmake/config-ix.cmake
++++ b/compiler-rt/cmake/config-ix.cmake
+@@ -63,6 +63,16 @@ if (C_SUPPORTS_NODEFAULTLIBS_FLAG)
+                         moldname mingwex msvcrt)
+     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
+   endif()
++  if (NOT TARGET unwind)
++    # Don't check for a library named unwind, if there's a target with that name within
++    # the same build.
++    check_library_exists(unwind _Unwind_GetRegionStart "" COMPILER_RT_HAS_LIBUNWIND)
++    if (COMPILER_RT_HAS_LIBUNWIND)
++      # If we're omitting default libraries, we might need to manually link in libunwind.
++      # This can affect whether we detect a statically linked libc++ correctly.
++      list(APPEND CMAKE_REQUIRED_LIBRARIES unwind)
++    endif()
++  endif()
+ endif ()
+ 
+ # CodeGen options.
diff --git a/debian/patches/series b/debian/patches/series
index b3b2ddc0..b7dcb850 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -135,7 +135,7 @@ protobuf_3.21.patch
 # compiler-rt
 compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
 compiler-rt/compilerrt-build-scudo-standalone-option.diff
-
+fix-unwind-detection-logic.patch
 
 # wasm patches
 wasm/wasm-ld-path.diff

From c57514041aab1c43fda206faf11ae0cc7306c267 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 6 Mar 2024 07:28:08 +0100
Subject: [PATCH 302/349] Merge changelogs together

---
 debian/changelog | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5f9b334..e1a0df3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,10 @@
-llvm-toolchain-17 (1:17.0.6-9) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
 
+  [ Zixing Liu ]
   * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
     libunwind detection logic when compiler-rt is disabled.
 
- -- Zixing Liu <zixing.liu@canonical.com>  Tue, 05 Mar 2024 21:17:18 -0700
-
-llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
-
+  [ Matthias Klose ]
   * Make libclang-common-17-dev architecture dependent.
 
  -- Matthias Klose <doko@debian.org>  Tue, 05 Mar 2024 23:42:57 +0100

From a0393bfef6c3d73ea372f5ca4f8fe5b9eac6bc8f Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 6 Mar 2024 08:39:21 +0100
Subject: [PATCH 303/349] From Zixing Liu:

d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix libunwind detection logic when compiler-rt is disabled.
---
 debian/changelog                              |  8 ++++
 .../patches/fix-unwind-detection-logic.patch  | 39 +++++++++++++++++++
 debian/patches/series                         |  2 +-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/fix-unwind-detection-logic.patch

diff --git a/debian/changelog b/debian/changelog
index a2a6aca8..3409f6c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+llvm-toolchain-16 (1:16.0.6-22) UNRELEASED; urgency=medium
+
+  [ Zixing Liu ]
+  * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
+    libunwind detection logic when compiler-rt is disabled.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 06 Mar 2024 08:38:53 +0100
+
 llvm-toolchain-16 (1:16.0.6-21) unstable; urgency=medium
 
   [ Steve Langasek ]
diff --git a/debian/patches/fix-unwind-detection-logic.patch b/debian/patches/fix-unwind-detection-logic.patch
new file mode 100644
index 00000000..667432c3
--- /dev/null
+++ b/debian/patches/fix-unwind-detection-logic.patch
@@ -0,0 +1,39 @@
+From 7c5e4e5fa3a948fc662be3a6bf057021d32f72e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+Date: Thu, 5 Oct 2023 11:41:11 +0300
+Subject: [PATCH] Reapply [compiler-rt] Check for and use -lunwind when linking
+ with -nodefaultlibs (#66584)
+
+If libc++ is available and should be used as the ubsan C++ ABI library,
+the check for libc++ might fail if libc++ is a static library, as the
+-nodefaultlibs flag inhibits a potential compiler default -lunwind.
+
+Just like the -nodefaultlibs configuration tests for and manually adds a
+bunch of compiler default libraries, look for -lunwind too.
+
+This is a reland of #65912.
+---
+ compiler-rt/cmake/config-ix.cmake | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
+index 09a9b62ce4cd37..a8e078f1ebc988 100644
+--- a/compiler-rt/cmake/config-ix.cmake
++++ b/compiler-rt/cmake/config-ix.cmake
+@@ -63,6 +63,16 @@ if (C_SUPPORTS_NODEFAULTLIBS_FLAG)
+                         moldname mingwex msvcrt)
+     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
+   endif()
++  if (NOT TARGET unwind)
++    # Don't check for a library named unwind, if there's a target with that name within
++    # the same build.
++    check_library_exists(unwind _Unwind_GetRegionStart "" COMPILER_RT_HAS_LIBUNWIND)
++    if (COMPILER_RT_HAS_LIBUNWIND)
++      # If we're omitting default libraries, we might need to manually link in libunwind.
++      # This can affect whether we detect a statically linked libc++ correctly.
++      list(APPEND CMAKE_REQUIRED_LIBRARIES unwind)
++    endif()
++  endif()
+ endif ()
+ 
+ # CodeGen options.
diff --git a/debian/patches/series b/debian/patches/series
index 52c1ee02..917f6e85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -135,7 +135,7 @@ protobuf_3.21.patch
 # compiler-rt
 compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
 compiler-rt/compilerrt-build-scudo-standalone-option.diff
-
+fix-unwind-detection-logic.patch
 
 # wasm patches
 wasm/wasm-ld-path.diff

From 200af0f3340dae6f2205d772c977ac8993567441 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 6 Mar 2024 08:42:22 +0100
Subject: [PATCH 304/349] Update changelog

---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3409f6c3..c6732a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ llvm-toolchain-16 (1:16.0.6-22) UNRELEASED; urgency=medium
   * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
     libunwind detection logic when compiler-rt is disabled.
 
+  [ Gianfranco Costamagna ]
+  * Disable tests on mips64el
+
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 06 Mar 2024 08:38:53 +0100
 
 llvm-toolchain-16 (1:16.0.6-21) unstable; urgency=medium

From 9cd31fb336647b3b8137b4f2f71845a87ec8c71b Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 6 Mar 2024 08:49:19 +0100
Subject: [PATCH 305/349] Upload to sid

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c6732a00..4bca982c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-16 (1:16.0.6-22) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-22) unstable; urgency=medium
 
   [ Zixing Liu ]
   * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix

From 0d717ce1236e33842f8ba4988de444060ddefa39 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 6 Mar 2024 09:20:28 +0100
Subject: [PATCH 306/349]   * Make libclang-common-18-dev architecture
 dependent, mark profile and xray     include files as optional on armel and
 armhf.

---
 debian/changelog                          | 7 ++++++-
 debian/libclang-common-X.Y-dev.install.in | 6 ++++--
 debian/rules                              | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5f9b334..529a293d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 llvm-toolchain-17 (1:17.0.6-9) UNRELEASED; urgency=medium
 
+  [ Zixing Liu ]
   * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
     libunwind detection logic when compiler-rt is disabled.
 
- -- Zixing Liu <zixing.liu@canonical.com>  Tue, 05 Mar 2024 21:17:18 -0700
+  [ Matthias Klose ]
+  * Make libclang-common-18-dev architecture dependent, mark profile and xray
+    include files as optional on armel and armhf.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 06 Mar 2024 09:19:34 +0100
 
 llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
 
diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
index 89cfed01..a2725566 100644
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
@@ -1,7 +1,9 @@
+#!/usr/bin/dh-exec
+
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap
-usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
-usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
+[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
+[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/
diff --git a/debian/rules b/debian/rules
index 3ec6c28d..315243a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -619,6 +619,7 @@ stamps/preconfigure:
 	chmod +x \
 		debian/clang-tools-$(LLVM_VERSION).install \
 		debian/libclang-$(LLVM_VERSION)-dev.install \
+		debian/libclang-common-$(LLVM_VERSION)-dev.install \
 		debian/libclang-rt-$(LLVM_VERSION)-dev.install \
 		debian/libpolly-$(LLVM_VERSION)-dev.install \
 		debian/libomp-$(LLVM_VERSION)-dev.install \

From 81e2edc30f43d1bd11ff03df178433a3015e9a2f Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 6 Mar 2024 09:21:49 +0100
Subject: [PATCH 307/349] merge changelog entries

---
 debian/changelog | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 529a293d..3057f4fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-17 (1:17.0.6-9) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
 
   [ Zixing Liu ]
   * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
@@ -10,12 +10,6 @@ llvm-toolchain-17 (1:17.0.6-9) UNRELEASED; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Wed, 06 Mar 2024 09:19:34 +0100
 
-llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
-
-  * Make libclang-common-17-dev architecture dependent.
-
- -- Matthias Klose <doko@debian.org>  Tue, 05 Mar 2024 23:42:57 +0100
-
 llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium
 
   * Fix mxgot export on mips64el

From f2cd318cb828c6e4a21bddd2f42dc3ac9562a6b2 Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Wed, 6 Mar 2024 13:25:38 -0700
Subject: [PATCH 308/349] Backport LLVM patch #75089 to fix compiler rt linkage

---
 ...-link-against-compiler-rt-explicitly.patch | 169 ++++++++++++++++++
 debian/patches/series                         |   1 +
 2 files changed, 170 insertions(+)
 create mode 100644 debian/patches/runtimes-Don-t-link-against-compiler-rt-explicitly.patch

diff --git a/debian/patches/runtimes-Don-t-link-against-compiler-rt-explicitly.patch b/debian/patches/runtimes-Don-t-link-against-compiler-rt-explicitly.patch
new file mode 100644
index 00000000..77a35c60
--- /dev/null
+++ b/debian/patches/runtimes-Don-t-link-against-compiler-rt-explicitly.patch
@@ -0,0 +1,169 @@
+From 2075c7d921f07d148f096c10f57c3bc43b239870 Mon Sep 17 00:00:00 2001
+From: Louis Dionne <ldionne.2@gmail.com>
+Date: Wed, 13 Dec 2023 13:57:48 -0500
+Subject: [PATCH 2/2] [runtimes] Don't link against compiler-rt explicitly when
+ we use -nostdlib++ (#75089)
+
+When we use the -nostdlib++ flag, we don't need to explicitly link
+against compiler-rt, since the compiler already links against it by
+default. This simplifies the flags that we need to use when building
+with Clang and GCC, and opens the door to further simplifications since
+most platforms won't need to detect whether libgcc and libgcc_s are
+supported anymore.
+
+Furthermore, on platforms where -nostdlib++ is used, this patch prevents
+manually linking compiler-rt *before* other system libraries. For
+example, Apple platforms have several compiler-rt symbols defined in
+libSystem.dylib. If we manually link against compiler-rt, we end up
+overriding the default link order preferred by the compiler and
+potentially using the symbols from the clang-provided libclang_rt.a
+library instead of the system provided one.
+
+Note that we don't touch how libunwind links against compiler-rt when it
+builds the .so/.a because libunwind currently doesn't use -nodefaultlibs
+and we want to avoid rocking the boat too much.
+
+rdar://119506163
+---
+ libcxx/CMakeLists.txt           | 30 ++++++++++++++++--------------
+ libcxx/cmake/config-ix.cmake    |  7 ++++++-
+ libcxxabi/cmake/config-ix.cmake |  7 ++++++-
+ libcxxabi/src/CMakeLists.txt    |  5 ++++-
+ libunwind/cmake/config-ix.cmake |  7 ++++++-
+ 5 files changed, 38 insertions(+), 18 deletions(-)
+
+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
+index e1f12549c9ec..3423348decfb 100644
+--- a/libcxx/CMakeLists.txt
++++ b/libcxx/CMakeLists.txt
+@@ -666,20 +666,22 @@ function(cxx_link_system_libraries target)
+     target_link_libraries(${target} PRIVATE rt)
+   endif()
+ 
+-  if (LIBCXX_USE_COMPILER_RT)
+-    find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
+-    if (LIBCXX_BUILTINS_LIBRARY)
+-      target_link_libraries(${target} PRIVATE "${LIBCXX_BUILTINS_LIBRARY}")
+-    endif()
+-  elseif (LIBCXX_HAS_GCC_LIB)
+-    target_link_libraries(${target} PRIVATE gcc)
+-    if (LIBCXX_HAS_ATOMIC_LIB)
+-      target_link_libraries(${target} PRIVATE atomic)
+-    endif()
+-  elseif (LIBCXX_HAS_GCC_S_LIB)
+-    target_link_libraries(${target} PRIVATE gcc_s)
+-    if (LIBCXX_HAS_ATOMIC_LIB)
+-      target_link_libraries(${target} PRIVATE atomic)
++  if (MSVC)
++    if (LIBCXX_USE_COMPILER_RT)
++      find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
++      if (LIBCXX_BUILTINS_LIBRARY)
++        target_link_libraries(${target} PRIVATE "${LIBCXX_BUILTINS_LIBRARY}")
++      endif()
++    elseif (LIBCXX_HAS_GCC_LIB)
++      target_link_libraries(${target} PRIVATE gcc)
++      if (LIBCXX_HAS_ATOMIC_LIB)
++        target_link_libraries(${target} PRIVATE atomic)
++      endif()
++    elseif (LIBCXX_HAS_GCC_S_LIB)
++      target_link_libraries(${target} PRIVATE gcc_s)
++      if (LIBCXX_HAS_ATOMIC_LIB)
++        target_link_libraries(${target} PRIVATE atomic)
++      endif()
+     endif()
+   endif()
+ 
+diff --git a/libcxx/cmake/config-ix.cmake b/libcxx/cmake/config-ix.cmake
+index 3bae53643683..19b112f36318 100644
+--- a/libcxx/cmake/config-ix.cmake
++++ b/libcxx/cmake/config-ix.cmake
+@@ -53,7 +53,9 @@ else()
+   endif()
+ endif()
+ 
+-if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
++# Only link against compiler-rt manually if we use -nodefaultlibs, since
++# otherwise the compiler will do the right thing on its own.
++if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG AND C_SUPPORTS_NODEFAULTLIBS_FLAG)
+   if (LIBCXX_HAS_C_LIB)
+     list(APPEND CMAKE_REQUIRED_LIBRARIES c)
+   endif ()
+@@ -84,6 +86,9 @@ if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
+                         moldname mingwex msvcrt)
+     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
+   endif()
++endif()
++
++if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
+   if (CMAKE_C_FLAGS MATCHES -fsanitize OR CMAKE_CXX_FLAGS MATCHES -fsanitize)
+     set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
+   endif ()
+diff --git a/libcxxabi/cmake/config-ix.cmake b/libcxxabi/cmake/config-ix.cmake
+index f4ee8946c1fe..a5daf6e48f77 100644
+--- a/libcxxabi/cmake/config-ix.cmake
++++ b/libcxxabi/cmake/config-ix.cmake
+@@ -33,7 +33,9 @@ else()
+   endif()
+ endif()
+ 
+-if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
++# Only link against compiler-rt manually if we use -nodefaultlibs, since
++# otherwise the compiler will do the right thing on its own.
++if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG AND C_SUPPORTS_NODEFAULTLIBS_FLAG)
+   if (LIBCXXABI_HAS_C_LIB)
+     list(APPEND CMAKE_REQUIRED_LIBRARIES c)
+   endif ()
+@@ -67,6 +69,9 @@ if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
+                         moldname mingwex msvcrt)
+     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
+   endif()
++endif()
++
++if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
+   if (CMAKE_C_FLAGS MATCHES -fsanitize OR CMAKE_CXX_FLAGS MATCHES -fsanitize)
+     set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
+   endif ()
+diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
+index 54002bafa0e2..a5fe833a10e2 100644
+--- a/libcxxabi/src/CMakeLists.txt
++++ b/libcxxabi/src/CMakeLists.txt
+@@ -167,7 +167,10 @@ if (LIBCXXABI_USE_LLVM_UNWINDER)
+     target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared)
+   endif()
+ endif()
+-target_link_libraries(cxxabi_shared_objects PRIVATE cxx-headers ${LIBCXXABI_BUILTINS_LIBRARY} ${LIBCXXABI_SHARED_LIBRARIES} ${LIBCXXABI_LIBRARIES})
++target_link_libraries(cxxabi_shared_objects PRIVATE cxx-headers ${LIBCXXABI_LIBRARIES} ${LIBCXXABI_SHARED_LIBRARIES})
++if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG)
++  target_link_libraries(cxxabi_shared_objects PRIVATE ${LIBCXXABI_BUILTINS_LIBRARY})
++endif()
+ target_link_libraries(cxxabi_shared_objects PUBLIC cxxabi-headers)
+ set_target_properties(cxxabi_shared_objects
+   PROPERTIES
+diff --git a/libunwind/cmake/config-ix.cmake b/libunwind/cmake/config-ix.cmake
+index d311477f02c6..d07c441bbd8a 100644
+--- a/libunwind/cmake/config-ix.cmake
++++ b/libunwind/cmake/config-ix.cmake
+@@ -41,7 +41,9 @@ else()
+   endif()
+ endif()
+ 
+-if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
++# Only link against compiler-rt manually if we use -nodefaultlibs, since
++# otherwise the compiler will do the right thing on its own.
++if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG AND C_SUPPORTS_NODEFAULTLIBS_FLAG)
+   if (LIBUNWIND_HAS_C_LIB)
+     list(APPEND CMAKE_REQUIRED_LIBRARIES c)
+   endif ()
+@@ -71,6 +73,9 @@ if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
+                         moldname mingwex msvcrt)
+     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
+   endif()
++endif()
++
++if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
+   if (CMAKE_C_FLAGS MATCHES -fsanitize OR CMAKE_CXX_FLAGS MATCHES -fsanitize)
+     set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
+   endif ()
+-- 
+2.44.0
+
diff --git a/debian/patches/series b/debian/patches/series
index b7dcb850..218d718c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -136,6 +136,7 @@ protobuf_3.21.patch
 compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
 compiler-rt/compilerrt-build-scudo-standalone-option.diff
 fix-unwind-detection-logic.patch
+runtimes-Don-t-link-against-compiler-rt-explicitly.patch
 
 # wasm patches
 wasm/wasm-ld-path.diff

From 22c0a38297dfe24d7d460ce248637ba830994a7c Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Wed, 6 Mar 2024 17:24:49 -0700
Subject: [PATCH 309/349] Disable LIBUNWIND_USE_COMPILER_RT when COMPILER_RT is
 disabled

---
 debian/rules | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 315243a8..6b30a66c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -509,6 +509,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH), mips64 mips64el))
 	LIBOMP_ARCH = mips64
 endif
 
+HAVE_COMPILER_RT := NO
+ifeq (,$(filter $(RUNTIMES),compiler-rt))
+	HAVE_COMPILER_RT = YES
+endif
 # if cmake is installed in /tmp/cmake/ uses it
 # Used to build llvm on old ubuntu (precise) on the llvm.org/apt/ ci
 CMAKE_BIN=cmake
@@ -767,7 +771,7 @@ endif
 	-DCOMPILER_RT_USE_LIBCXX=OFF \
 	-DCOMPILER_RT_USE_BUILTINS_LIBRARY=$(COMPILER_RT_USE_BUILTINS_LIBRARY) \
 	-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-	-DLIBUNWIND_USE_COMPILER_RT=ON \
+	-DLIBUNWIND_USE_COMPILER_RT=$(HAVE_COMPILER_RT) \
 	-DLIBUNWIND_INSTALL_LIBRARY=OFF \
 	-DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \
 	-DLIBCXXABI_USE_COMPILER_RT=$(LIBCXX_USE_COMPILER_RT) \

From 1eb95067840adc4269406f7084e50036b97c7b70 Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Wed, 6 Mar 2024 17:29:35 -0700
Subject: [PATCH 310/349] changelog: add new entries

---
 debian/changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3057f4fa..92b8bff3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,15 @@ llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
   [ Zixing Liu ]
   * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
     libunwind detection logic when compiler-rt is disabled.
+  * d/p/runtimes-Don-t-link-against-compiler-rt-explicitly.patch: Backport
+    LLVM patch #75089 to fix compiler rt linkage.
+  * d/rules: Disable LIBUNWIND_USE_COMPILER_RT when COMPILER_RT is disabled.
 
   [ Matthias Klose ]
   * Make libclang-common-18-dev architecture dependent, mark profile and xray
     include files as optional on armel and armhf.
 
- -- Matthias Klose <doko@debian.org>  Wed, 06 Mar 2024 09:19:34 +0100
+ -- Zixing Liu <zixing.liu@canonical.com>  Wed, 06 Mar 2024 17:27:22 -0700
 
 llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium
 

From 69ac5b7c8c23890b607a5e5d2a0d0bb3bf33c194 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Thu, 7 Mar 2024 16:57:48 +0100
Subject: [PATCH 311/349]   * Fix sanitizer build on 32bit time_t64
 architectures.

---
 debian/changelog                          |  3 ++-
 debian/patches/libsanitizer-timebits.diff | 22 ++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/libsanitizer-timebits.diff

diff --git a/debian/changelog b/debian/changelog
index 92b8bff3..f84ded1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
   [ Matthias Klose ]
   * Make libclang-common-18-dev architecture dependent, mark profile and xray
     include files as optional on armel and armhf.
+  * Fix sanitizer build on 32bit time_t64 architectures.
 
- -- Zixing Liu <zixing.liu@canonical.com>  Wed, 06 Mar 2024 17:27:22 -0700
+ -- Matthias Klose <doko@debian.org>  Thu, 07 Mar 2024 16:56:50 +0100
 
 llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium
 
diff --git a/debian/patches/libsanitizer-timebits.diff b/debian/patches/libsanitizer-timebits.diff
new file mode 100644
index 00000000..f5ee919a
--- /dev/null
+++ b/debian/patches/libsanitizer-timebits.diff
@@ -0,0 +1,22 @@
+# DP: Add another #undef for _TIME_BITS
+
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
+@@ -11,6 +11,7 @@
+ 
+ // Before Solaris 11.4, <procfs.h> doesn't work in a largefile environment.
+ #undef _FILE_OFFSET_BITS
++#undef _TIME_BITS
+ #include "sanitizer_platform.h"
+ #if SANITIZER_SOLARIS
+ #  include <fcntl.h>
+#--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+#+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+#@@ -18,6 +18,7 @@
+# // depends on _FILE_OFFSET_BITS setting.
+# // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
+# #undef _FILE_OFFSET_BITS
+#+#undef _TIME_BITS
+# #endif
+# 
+# // Must go after undef _FILE_OFFSET_BITS.
diff --git a/debian/patches/series b/debian/patches/series
index 218d718c..b800747c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -154,3 +154,4 @@ libclang-major-version-only.diff
 D148945-revert.diff
 arm32-defaults.diff
 mips/D154390-pre-R6.diff
+libsanitizer-timebits.diff

From 38205121278853594452e5525a1c00d4f50398ab Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 8 Mar 2024 14:54:29 +0100
Subject: [PATCH 312/349]   * Enable compiler-rt runtime again for 32bit
 time_t64 architectures.

---
 debian/changelog |  3 ++-
 debian/rules     | 12 ++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f84ded1f..8e1f0350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
   * Make libclang-common-18-dev architecture dependent, mark profile and xray
     include files as optional on armel and armhf.
   * Fix sanitizer build on 32bit time_t64 architectures.
+  * Enable compiler-rt runtime again for 32bit time_t64 architectures.
 
- -- Matthias Klose <doko@debian.org>  Thu, 07 Mar 2024 16:56:50 +0100
+ -- Matthias Klose <doko@debian.org>  Fri, 08 Mar 2024 14:52:29 +0100
 
 llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 6b30a66c..1c4a6a34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,16 +24,8 @@ LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$N
 # dpkg-buildflags support
 # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
 export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
-ifeq ($(DEB_HOST_ARCH),i386)
-  RUNTIMES = compiler-rt;libcxx;libcxxabi
-else
-  ifeq ($(DEB_HOST_ARCH_BITS),32)
-    RUNTIMES = libcxx;libcxxabi
-    skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev
-  else
-    RUNTIMES = compiler-rt;libcxx;libcxxabi
-  endif
-endif
+
+RUNTIMES = compiler-rt;libcxx;libcxxabi
 
 SOURCE_NAME := $(shell dpkg-parsechangelog -S Source)
 ifneq (,$(findstring snapshot,$(SOURCE_NAME)))

From 13375484b43faf387af0300dd740511b862b7d17 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 8 Mar 2024 15:38:14 +0100
Subject: [PATCH 313/349] Revert: mark profile and xray include files as
 optional on armel and armhf.

---
 debian/changelog                          | 3 +--
 debian/libclang-common-X.Y-dev.install.in | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e1f0350..684e49a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,7 @@ llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
   * d/rules: Disable LIBUNWIND_USE_COMPILER_RT when COMPILER_RT is disabled.
 
   [ Matthias Klose ]
-  * Make libclang-common-18-dev architecture dependent, mark profile and xray
-    include files as optional on armel and armhf.
+  * Make libclang-common-18-dev architecture dependent.
   * Fix sanitizer build on 32bit time_t64 architectures.
   * Enable compiler-rt runtime again for 32bit time_t64 architectures.
 
diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
index a2725566..b059a8ed 100644
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
@@ -2,8 +2,8 @@
 
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap
-[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
-[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
+usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
+usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/

From 387c617b019785aeee36eab808abb1324b0dbe08 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 8 Mar 2024 15:49:39 +0100
Subject: [PATCH 314/349] fix typo in changelog

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 684e49a9..11dc6fb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
   * d/rules: Disable LIBUNWIND_USE_COMPILER_RT when COMPILER_RT is disabled.
 
   [ Matthias Klose ]
-  * Make libclang-common-18-dev architecture dependent.
+  * Make libclang-common-17-dev architecture dependent.
   * Fix sanitizer build on 32bit time_t64 architectures.
   * Enable compiler-rt runtime again for 32bit time_t64 architectures.
 

From 25f044b2226ad8ad208951b9a90e84b24315da98 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Mar 2024 15:49:52 +0100
Subject: [PATCH 315/349] Revert "  * Make libclang-common-18-dev architecture
 dependent, mark profile and xray"

This reverts commit 0d717ce1236e33842f8ba4988de444060ddefa39.
---
 debian/changelog                          | 6 ++----
 debian/libclang-common-X.Y-dev.install.in | 6 ++----
 debian/rules                              | 1 -
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92b8bff3..800b1da0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,13 @@
 llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
 
-  [ Zixing Liu ]
   * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
     libunwind detection logic when compiler-rt is disabled.
   * d/p/runtimes-Don-t-link-against-compiler-rt-explicitly.patch: Backport
     LLVM patch #75089 to fix compiler rt linkage.
   * d/rules: Disable LIBUNWIND_USE_COMPILER_RT when COMPILER_RT is disabled.
 
-  [ Matthias Klose ]
-  * Make libclang-common-18-dev architecture dependent, mark profile and xray
-    include files as optional on armel and armhf.
+  [ Matthias Klose ] 
+  * Make libclang-common-17-dev architecture dependent.
 
  -- Zixing Liu <zixing.liu@canonical.com>  Wed, 06 Mar 2024 17:27:22 -0700
 
diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in
index a2725566..89cfed01 100644
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
@@ -1,9 +1,7 @@
-#!/usr/bin/dh-exec
-
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap
-[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
-[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
+usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/
+usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/
diff --git a/debian/rules b/debian/rules
index 6b30a66c..67b35b18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -623,7 +623,6 @@ stamps/preconfigure:
 	chmod +x \
 		debian/clang-tools-$(LLVM_VERSION).install \
 		debian/libclang-$(LLVM_VERSION)-dev.install \
-		debian/libclang-common-$(LLVM_VERSION)-dev.install \
 		debian/libclang-rt-$(LLVM_VERSION)-dev.install \
 		debian/libpolly-$(LLVM_VERSION)-dev.install \
 		debian/libomp-$(LLVM_VERSION)-dev.install \

From 5ca2adc3576c39bf7980ba94d1c8c89fb7e8092d Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Mar 2024 15:50:31 +0100
Subject: [PATCH 316/349] Drop hack

---
 debian/rules | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/rules b/debian/rules
index 67b35b18..7d4532b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,16 +24,7 @@ LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$N
 # dpkg-buildflags support
 # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
 export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
-ifeq ($(DEB_HOST_ARCH),i386)
-  RUNTIMES = compiler-rt;libcxx;libcxxabi
-else
-  ifeq ($(DEB_HOST_ARCH_BITS),32)
-    RUNTIMES = libcxx;libcxxabi
-    skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev
-  else
-    RUNTIMES = compiler-rt;libcxx;libcxxabi
-  endif
-endif
+RUNTIMES = compiler-rt;libcxx;libcxxabi
 
 SOURCE_NAME := $(shell dpkg-parsechangelog -S Source)
 ifneq (,$(findstring snapshot,$(SOURCE_NAME)))
@@ -1380,7 +1371,7 @@ else
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
 endif
 endif
-	dh_install --fail-missing ${skip_packages}
+	dh_install --fail-missing
 # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages
 # These packages are arch: all, so only do so when the packages are built
 ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(packages)))
@@ -1508,11 +1499,8 @@ override_dh_auto_test:
 endif
 
 
-override_dh_builddeb:
-	dh_builddeb ${skip_packages}
-
 override_dh_gencontrol: stamps/sccache-stats
-	dh_gencontrol ${skip_packages} -- $(control_vars)
+	dh_gencontrol -- $(control_vars)
 
 
 override_dh_auto_clean:

From e5f5a75f7db4ef1e5b5d82ea91bfb6285fbe39be Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Mar 2024 15:51:37 +0100
Subject: [PATCH 317/349] Drop compiler-rt hacks

---
 .../patches/fix-unwind-detection-logic.patch  |  39 ----
 ...-link-against-compiler-rt-explicitly.patch | 169 ------------------
 debian/patches/series                         |   2 -
 debian/rules                                  |   6 +-
 4 files changed, 1 insertion(+), 215 deletions(-)
 delete mode 100644 debian/patches/fix-unwind-detection-logic.patch
 delete mode 100644 debian/patches/runtimes-Don-t-link-against-compiler-rt-explicitly.patch

diff --git a/debian/patches/fix-unwind-detection-logic.patch b/debian/patches/fix-unwind-detection-logic.patch
deleted file mode 100644
index 667432c3..00000000
--- a/debian/patches/fix-unwind-detection-logic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7c5e4e5fa3a948fc662be3a6bf057021d32f72e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Thu, 5 Oct 2023 11:41:11 +0300
-Subject: [PATCH] Reapply [compiler-rt] Check for and use -lunwind when linking
- with -nodefaultlibs (#66584)
-
-If libc++ is available and should be used as the ubsan C++ ABI library,
-the check for libc++ might fail if libc++ is a static library, as the
--nodefaultlibs flag inhibits a potential compiler default -lunwind.
-
-Just like the -nodefaultlibs configuration tests for and manually adds a
-bunch of compiler default libraries, look for -lunwind too.
-
-This is a reland of #65912.
----
- compiler-rt/cmake/config-ix.cmake | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
-index 09a9b62ce4cd37..a8e078f1ebc988 100644
---- a/compiler-rt/cmake/config-ix.cmake
-+++ b/compiler-rt/cmake/config-ix.cmake
-@@ -63,6 +63,16 @@ if (C_SUPPORTS_NODEFAULTLIBS_FLAG)
-                         moldname mingwex msvcrt)
-     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
-   endif()
-+  if (NOT TARGET unwind)
-+    # Don't check for a library named unwind, if there's a target with that name within
-+    # the same build.
-+    check_library_exists(unwind _Unwind_GetRegionStart "" COMPILER_RT_HAS_LIBUNWIND)
-+    if (COMPILER_RT_HAS_LIBUNWIND)
-+      # If we're omitting default libraries, we might need to manually link in libunwind.
-+      # This can affect whether we detect a statically linked libc++ correctly.
-+      list(APPEND CMAKE_REQUIRED_LIBRARIES unwind)
-+    endif()
-+  endif()
- endif ()
- 
- # CodeGen options.
diff --git a/debian/patches/runtimes-Don-t-link-against-compiler-rt-explicitly.patch b/debian/patches/runtimes-Don-t-link-against-compiler-rt-explicitly.patch
deleted file mode 100644
index 77a35c60..00000000
--- a/debian/patches/runtimes-Don-t-link-against-compiler-rt-explicitly.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 2075c7d921f07d148f096c10f57c3bc43b239870 Mon Sep 17 00:00:00 2001
-From: Louis Dionne <ldionne.2@gmail.com>
-Date: Wed, 13 Dec 2023 13:57:48 -0500
-Subject: [PATCH 2/2] [runtimes] Don't link against compiler-rt explicitly when
- we use -nostdlib++ (#75089)
-
-When we use the -nostdlib++ flag, we don't need to explicitly link
-against compiler-rt, since the compiler already links against it by
-default. This simplifies the flags that we need to use when building
-with Clang and GCC, and opens the door to further simplifications since
-most platforms won't need to detect whether libgcc and libgcc_s are
-supported anymore.
-
-Furthermore, on platforms where -nostdlib++ is used, this patch prevents
-manually linking compiler-rt *before* other system libraries. For
-example, Apple platforms have several compiler-rt symbols defined in
-libSystem.dylib. If we manually link against compiler-rt, we end up
-overriding the default link order preferred by the compiler and
-potentially using the symbols from the clang-provided libclang_rt.a
-library instead of the system provided one.
-
-Note that we don't touch how libunwind links against compiler-rt when it
-builds the .so/.a because libunwind currently doesn't use -nodefaultlibs
-and we want to avoid rocking the boat too much.
-
-rdar://119506163
----
- libcxx/CMakeLists.txt           | 30 ++++++++++++++++--------------
- libcxx/cmake/config-ix.cmake    |  7 ++++++-
- libcxxabi/cmake/config-ix.cmake |  7 ++++++-
- libcxxabi/src/CMakeLists.txt    |  5 ++++-
- libunwind/cmake/config-ix.cmake |  7 ++++++-
- 5 files changed, 38 insertions(+), 18 deletions(-)
-
-diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
-index e1f12549c9ec..3423348decfb 100644
---- a/libcxx/CMakeLists.txt
-+++ b/libcxx/CMakeLists.txt
-@@ -666,20 +666,22 @@ function(cxx_link_system_libraries target)
-     target_link_libraries(${target} PRIVATE rt)
-   endif()
- 
--  if (LIBCXX_USE_COMPILER_RT)
--    find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
--    if (LIBCXX_BUILTINS_LIBRARY)
--      target_link_libraries(${target} PRIVATE "${LIBCXX_BUILTINS_LIBRARY}")
--    endif()
--  elseif (LIBCXX_HAS_GCC_LIB)
--    target_link_libraries(${target} PRIVATE gcc)
--    if (LIBCXX_HAS_ATOMIC_LIB)
--      target_link_libraries(${target} PRIVATE atomic)
--    endif()
--  elseif (LIBCXX_HAS_GCC_S_LIB)
--    target_link_libraries(${target} PRIVATE gcc_s)
--    if (LIBCXX_HAS_ATOMIC_LIB)
--      target_link_libraries(${target} PRIVATE atomic)
-+  if (MSVC)
-+    if (LIBCXX_USE_COMPILER_RT)
-+      find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
-+      if (LIBCXX_BUILTINS_LIBRARY)
-+        target_link_libraries(${target} PRIVATE "${LIBCXX_BUILTINS_LIBRARY}")
-+      endif()
-+    elseif (LIBCXX_HAS_GCC_LIB)
-+      target_link_libraries(${target} PRIVATE gcc)
-+      if (LIBCXX_HAS_ATOMIC_LIB)
-+        target_link_libraries(${target} PRIVATE atomic)
-+      endif()
-+    elseif (LIBCXX_HAS_GCC_S_LIB)
-+      target_link_libraries(${target} PRIVATE gcc_s)
-+      if (LIBCXX_HAS_ATOMIC_LIB)
-+        target_link_libraries(${target} PRIVATE atomic)
-+      endif()
-     endif()
-   endif()
- 
-diff --git a/libcxx/cmake/config-ix.cmake b/libcxx/cmake/config-ix.cmake
-index 3bae53643683..19b112f36318 100644
---- a/libcxx/cmake/config-ix.cmake
-+++ b/libcxx/cmake/config-ix.cmake
-@@ -53,7 +53,9 @@ else()
-   endif()
- endif()
- 
--if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
-+# Only link against compiler-rt manually if we use -nodefaultlibs, since
-+# otherwise the compiler will do the right thing on its own.
-+if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG AND C_SUPPORTS_NODEFAULTLIBS_FLAG)
-   if (LIBCXX_HAS_C_LIB)
-     list(APPEND CMAKE_REQUIRED_LIBRARIES c)
-   endif ()
-@@ -84,6 +86,9 @@ if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
-                         moldname mingwex msvcrt)
-     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
-   endif()
-+endif()
-+
-+if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
-   if (CMAKE_C_FLAGS MATCHES -fsanitize OR CMAKE_CXX_FLAGS MATCHES -fsanitize)
-     set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
-   endif ()
-diff --git a/libcxxabi/cmake/config-ix.cmake b/libcxxabi/cmake/config-ix.cmake
-index f4ee8946c1fe..a5daf6e48f77 100644
---- a/libcxxabi/cmake/config-ix.cmake
-+++ b/libcxxabi/cmake/config-ix.cmake
-@@ -33,7 +33,9 @@ else()
-   endif()
- endif()
- 
--if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
-+# Only link against compiler-rt manually if we use -nodefaultlibs, since
-+# otherwise the compiler will do the right thing on its own.
-+if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG AND C_SUPPORTS_NODEFAULTLIBS_FLAG)
-   if (LIBCXXABI_HAS_C_LIB)
-     list(APPEND CMAKE_REQUIRED_LIBRARIES c)
-   endif ()
-@@ -67,6 +69,9 @@ if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
-                         moldname mingwex msvcrt)
-     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
-   endif()
-+endif()
-+
-+if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
-   if (CMAKE_C_FLAGS MATCHES -fsanitize OR CMAKE_CXX_FLAGS MATCHES -fsanitize)
-     set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
-   endif ()
-diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
-index 54002bafa0e2..a5fe833a10e2 100644
---- a/libcxxabi/src/CMakeLists.txt
-+++ b/libcxxabi/src/CMakeLists.txt
-@@ -167,7 +167,10 @@ if (LIBCXXABI_USE_LLVM_UNWINDER)
-     target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared)
-   endif()
- endif()
--target_link_libraries(cxxabi_shared_objects PRIVATE cxx-headers ${LIBCXXABI_BUILTINS_LIBRARY} ${LIBCXXABI_SHARED_LIBRARIES} ${LIBCXXABI_LIBRARIES})
-+target_link_libraries(cxxabi_shared_objects PRIVATE cxx-headers ${LIBCXXABI_LIBRARIES} ${LIBCXXABI_SHARED_LIBRARIES})
-+if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG)
-+  target_link_libraries(cxxabi_shared_objects PRIVATE ${LIBCXXABI_BUILTINS_LIBRARY})
-+endif()
- target_link_libraries(cxxabi_shared_objects PUBLIC cxxabi-headers)
- set_target_properties(cxxabi_shared_objects
-   PROPERTIES
-diff --git a/libunwind/cmake/config-ix.cmake b/libunwind/cmake/config-ix.cmake
-index d311477f02c6..d07c441bbd8a 100644
---- a/libunwind/cmake/config-ix.cmake
-+++ b/libunwind/cmake/config-ix.cmake
-@@ -41,7 +41,9 @@ else()
-   endif()
- endif()
- 
--if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
-+# Only link against compiler-rt manually if we use -nodefaultlibs, since
-+# otherwise the compiler will do the right thing on its own.
-+if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG AND C_SUPPORTS_NODEFAULTLIBS_FLAG)
-   if (LIBUNWIND_HAS_C_LIB)
-     list(APPEND CMAKE_REQUIRED_LIBRARIES c)
-   endif ()
-@@ -71,6 +73,9 @@ if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
-                         moldname mingwex msvcrt)
-     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
-   endif()
-+endif()
-+
-+if (CXX_SUPPORTS_NOSTDLIBXX_FLAG OR C_SUPPORTS_NODEFAULTLIBS_FLAG)
-   if (CMAKE_C_FLAGS MATCHES -fsanitize OR CMAKE_CXX_FLAGS MATCHES -fsanitize)
-     set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
-   endif ()
--- 
-2.44.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 218d718c..9b6c868c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -135,8 +135,6 @@ protobuf_3.21.patch
 # compiler-rt
 compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
 compiler-rt/compilerrt-build-scudo-standalone-option.diff
-fix-unwind-detection-logic.patch
-runtimes-Don-t-link-against-compiler-rt-explicitly.patch
 
 # wasm patches
 wasm/wasm-ld-path.diff
diff --git a/debian/rules b/debian/rules
index 7d4532b7..7c84baaf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -500,10 +500,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH), mips64 mips64el))
 	LIBOMP_ARCH = mips64
 endif
 
-HAVE_COMPILER_RT := NO
-ifeq (,$(filter $(RUNTIMES),compiler-rt))
-	HAVE_COMPILER_RT = YES
-endif
 # if cmake is installed in /tmp/cmake/ uses it
 # Used to build llvm on old ubuntu (precise) on the llvm.org/apt/ ci
 CMAKE_BIN=cmake
@@ -761,7 +757,7 @@ endif
 	-DCOMPILER_RT_USE_LIBCXX=OFF \
 	-DCOMPILER_RT_USE_BUILTINS_LIBRARY=$(COMPILER_RT_USE_BUILTINS_LIBRARY) \
 	-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-	-DLIBUNWIND_USE_COMPILER_RT=$(HAVE_COMPILER_RT) \
+	-DLIBUNWIND_USE_COMPILER_RT=ON \
 	-DLIBUNWIND_INSTALL_LIBRARY=OFF \
 	-DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \
 	-DLIBCXXABI_USE_COMPILER_RT=$(LIBCXX_USE_COMPILER_RT) \

From 2d98c52c9ca0029340399ba2ea668fd9bdf69ad0 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Mar 2024 15:52:00 +0100
Subject: [PATCH 318/349] Drop changelog entries

---
 debian/changelog | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 800b1da0..6df05d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,5 @@
 llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
 
-  * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
-    libunwind detection logic when compiler-rt is disabled.
-  * d/p/runtimes-Don-t-link-against-compiler-rt-explicitly.patch: Backport
-    LLVM patch #75089 to fix compiler rt linkage.
-  * d/rules: Disable LIBUNWIND_USE_COMPILER_RT when COMPILER_RT is disabled.
-
   [ Matthias Klose ] 
   * Make libclang-common-17-dev architecture dependent.
 

From b78652a78268f0ddfe9f2cb7b34d934b5cd60084 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Mar 2024 15:53:14 +0100
Subject: [PATCH 319/349] Update changelog

---
 debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6df05d55..302f1b4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-8) unstable; urgency=medium
 
-  [ Matthias Klose ] 
+  [ Matthias Klose ]
   * Make libclang-common-17-dev architecture dependent.
 
- -- Zixing Liu <zixing.liu@canonical.com>  Wed, 06 Mar 2024 17:27:22 -0700
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 08 Mar 2024 15:52:58 +0100
 
 llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium
 

From c73a5a6e721382bf89f4acf0d18396789dc71445 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Mar 2024 15:56:39 +0100
Subject: [PATCH 320/349] Fix changelog merge

---
 debian/changelog | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 597567fc..32b6c227 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,15 +2,10 @@ llvm-toolchain-17 (1:17.0.6-8) unstable; urgency=medium
 
   [ Matthias Klose ]
   * Make libclang-common-17-dev architecture dependent.
-<<<<<<< HEAD
-
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 08 Mar 2024 15:52:58 +0100
-=======
   * Fix sanitizer build on 32bit time_t64 architectures.
   * Enable compiler-rt runtime again for 32bit time_t64 architectures.
 
  -- Matthias Klose <doko@debian.org>  Fri, 08 Mar 2024 14:52:29 +0100
->>>>>>> origin/17
 
 llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium
 

From 20819031eb56bbe1cd2acc5c9d57a03c255ac25c Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Mar 2024 16:01:18 +0100
Subject: [PATCH 321/349] Revert unwind detection logic changes

---
 debian/changelog                              |  4 --
 .../patches/fix-unwind-detection-logic.patch  | 39 -------------------
 debian/patches/series                         |  1 -
 3 files changed, 44 deletions(-)
 delete mode 100644 debian/patches/fix-unwind-detection-logic.patch

diff --git a/debian/changelog b/debian/changelog
index 4bca982c..d72d23f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
 llvm-toolchain-16 (1:16.0.6-22) unstable; urgency=medium
 
-  [ Zixing Liu ]
-  * d/p/fix-unwind-detection-logic.patch: use an upstream patch to fix
-    libunwind detection logic when compiler-rt is disabled.
-
   [ Gianfranco Costamagna ]
   * Disable tests on mips64el
 
diff --git a/debian/patches/fix-unwind-detection-logic.patch b/debian/patches/fix-unwind-detection-logic.patch
deleted file mode 100644
index 667432c3..00000000
--- a/debian/patches/fix-unwind-detection-logic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7c5e4e5fa3a948fc662be3a6bf057021d32f72e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Thu, 5 Oct 2023 11:41:11 +0300
-Subject: [PATCH] Reapply [compiler-rt] Check for and use -lunwind when linking
- with -nodefaultlibs (#66584)
-
-If libc++ is available and should be used as the ubsan C++ ABI library,
-the check for libc++ might fail if libc++ is a static library, as the
--nodefaultlibs flag inhibits a potential compiler default -lunwind.
-
-Just like the -nodefaultlibs configuration tests for and manually adds a
-bunch of compiler default libraries, look for -lunwind too.
-
-This is a reland of #65912.
----
- compiler-rt/cmake/config-ix.cmake | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
-index 09a9b62ce4cd37..a8e078f1ebc988 100644
---- a/compiler-rt/cmake/config-ix.cmake
-+++ b/compiler-rt/cmake/config-ix.cmake
-@@ -63,6 +63,16 @@ if (C_SUPPORTS_NODEFAULTLIBS_FLAG)
-                         moldname mingwex msvcrt)
-     list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
-   endif()
-+  if (NOT TARGET unwind)
-+    # Don't check for a library named unwind, if there's a target with that name within
-+    # the same build.
-+    check_library_exists(unwind _Unwind_GetRegionStart "" COMPILER_RT_HAS_LIBUNWIND)
-+    if (COMPILER_RT_HAS_LIBUNWIND)
-+      # If we're omitting default libraries, we might need to manually link in libunwind.
-+      # This can affect whether we detect a statically linked libc++ correctly.
-+      list(APPEND CMAKE_REQUIRED_LIBRARIES unwind)
-+    endif()
-+  endif()
- endif ()
- 
- # CodeGen options.
diff --git a/debian/patches/series b/debian/patches/series
index 917f6e85..d8a86985 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -135,7 +135,6 @@ protobuf_3.21.patch
 # compiler-rt
 compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
 compiler-rt/compilerrt-build-scudo-standalone-option.diff
-fix-unwind-detection-logic.patch
 
 # wasm patches
 wasm/wasm-ld-path.diff

From 8c3b7796c49b32723510f4e4b30fc738f21f52f2 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Mar 2024 16:04:40 +0100
Subject: [PATCH 322/349] Revert compiler-rt hacks

---
 debian/rules | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/debian/rules b/debian/rules
index f7b8828c..a437a8de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,16 +22,7 @@ endif
 # dpkg-buildflags support
 # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto
 export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto
-ifeq ($(DEB_HOST_ARCH),i386)
-  RUNTIMES = compiler-rt;libcxx;libcxxabi
-else
-  ifeq ($(DEB_HOST_ARCH_BITS),32)
-    RUNTIMES = libcxx;libcxxabi
-    skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev
-  else
-    RUNTIMES = compiler-rt;libcxx;libcxxabi
-  endif
-endif
+RUNTIMES = compiler-rt;libcxx;libcxxabi
 
 SOURCE_NAME := $(shell dpkg-parsechangelog -S Source)
 ifneq (,$(findstring snapshot,$(SOURCE_NAME)))
@@ -1048,7 +1039,7 @@ override_dh_auto_install:
 ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64))
 ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 	# To fix custom-library-search-path
-	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so || true
+	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so
 endif
 endif
 
@@ -1299,7 +1290,7 @@ else
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
 endif
 endif
-	dh_install --fail-missing ${skip_packages}
+	dh_install --fail-missing
 # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages
 # These packages are arch: all, so only do so when the packages are built
 ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(shell dh_listpackages)))
@@ -1427,11 +1418,8 @@ override_dh_auto_test:
 endif
 
 
-override_dh_builddeb:
-	dh_builddeb ${skip_packages}
-
 override_dh_gencontrol: sccache-stats
-	dh_gencontrol ${skip_packages} -- $(control_vars)
+	dh_gencontrol -- $(control_vars)
 
 
 override_dh_auto_clean:

From b74f7bdca8a1e643aac9cfcff9c774b0811a752f Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Thu, 7 Mar 2024 16:57:48 +0100
Subject: [PATCH 323/349]   * Fix sanitizer build on 32bit time_t64
 architectures.

---
 debian/changelog                          |  5 +++++
 debian/patches/libsanitizer-timebits.diff | 22 ++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 debian/patches/libsanitizer-timebits.diff

diff --git a/debian/changelog b/debian/changelog
index d72d23f4..39ca0a9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ llvm-toolchain-16 (1:16.0.6-22) unstable; urgency=medium
   [ Gianfranco Costamagna ]
   * Disable tests on mips64el
 
+  [ Matthias Klose ]
+  * Make libclang-common-18-dev architecture dependent, mark profile and xray
+    include files as optional on armel and armhf.
+  * Fix sanitizer build on 32bit time_t64 architectures.
+
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 06 Mar 2024 08:38:53 +0100
 
 llvm-toolchain-16 (1:16.0.6-21) unstable; urgency=medium
diff --git a/debian/patches/libsanitizer-timebits.diff b/debian/patches/libsanitizer-timebits.diff
new file mode 100644
index 00000000..f5ee919a
--- /dev/null
+++ b/debian/patches/libsanitizer-timebits.diff
@@ -0,0 +1,22 @@
+# DP: Add another #undef for _TIME_BITS
+
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
+@@ -11,6 +11,7 @@
+ 
+ // Before Solaris 11.4, <procfs.h> doesn't work in a largefile environment.
+ #undef _FILE_OFFSET_BITS
++#undef _TIME_BITS
+ #include "sanitizer_platform.h"
+ #if SANITIZER_SOLARIS
+ #  include <fcntl.h>
+#--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+#+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+#@@ -18,6 +18,7 @@
+# // depends on _FILE_OFFSET_BITS setting.
+# // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
+# #undef _FILE_OFFSET_BITS
+#+#undef _TIME_BITS
+# #endif
+# 
+# // Must go after undef _FILE_OFFSET_BITS.
diff --git a/debian/patches/series b/debian/patches/series
index d8a86985..87ae970c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -155,3 +155,4 @@ D158066-simd-ppc64el.patch
 
 D142688-loong64.diff
 remove-unused-imp-module.diff
+libsanitizer-timebits.diff

From e11b894442cbd2ac0ef6f791c60cdf159ee42814 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 8 Mar 2024 16:50:33 +0100
Subject: [PATCH 324/349] Drop extra hack

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 7c84baaf..202e860d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1115,7 +1115,7 @@ override_dh_auto_install:
 ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64))
 ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 	# To fix custom-library-search-path
-	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so || true
+	chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so
 endif
 endif
 

From 1e14d1ffbaee7fc35c010015df5e9c364f4df6d5 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 10 Mar 2024 01:39:41 +0100
Subject: [PATCH 325/349] Upload to sid

---
 debian/changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 32b6c227..e56bd3ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,7 @@
-llvm-toolchain-17 (1:17.0.6-8) unstable; urgency=medium
+llvm-toolchain-17 (1:17.0.6-9) unstable; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * Bump version to -9, the -8 is already used in Ubuntu
 
   [ Matthias Klose ]
   * Make libclang-common-17-dev architecture dependent.

From 518f0fa5b4fd2bbb7176f4a00a14f44190997a44 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 10 Mar 2024 01:45:35 +0100
Subject: [PATCH 326/349] Update changelog

---
 debian/changelog | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39ca0a9c..6eae0ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ llvm-toolchain-16 (1:16.0.6-22) unstable; urgency=medium
   * Disable tests on mips64el
 
   [ Matthias Klose ]
-  * Make libclang-common-18-dev architecture dependent, mark profile and xray
-    include files as optional on armel and armhf.
   * Fix sanitizer build on 32bit time_t64 architectures.
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 06 Mar 2024 08:38:53 +0100

From 08c22a2df4d147ab96fe8d7d999f6222d6ef013a Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sun, 10 Mar 2024 07:52:09 +0100
Subject: [PATCH 327/349] Fixup arch:all->arch:any migration

---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index a3b0b67f..a489081f 100644
--- a/debian/control
+++ b/debian/control
@@ -107,7 +107,7 @@ Package: clangd-17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libllvm17t64 (= ${binary:Version}),
- libclang-common-17-dev (= ${source:Version}),
+ libclang-common-17-dev (= ${binary:Version}),
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
   - code completion
diff --git a/debian/control.in b/debian/control.in
index b13dcb86..2fdf5e56 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -107,7 +107,7 @@ Package: clangd-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libllvm@LLVM_VERSION@t64 (= ${binary:Version}),
- libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
+ libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
   - code completion

From 3d4b64df99fd699eb653af597553ff661f0dff1d Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Mon, 11 Mar 2024 22:49:01 +0100
Subject: [PATCH 328/349] Uncomment part of sanitizer patch, from <doko>

---
 debian/changelog                          |  7 +++++++
 debian/patches/libsanitizer-timebits.diff | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6eae0ba1..a6098d29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-16 (1:16.0.6-23) unstable; urgency=medium
+
+  [ Matthias Klose ]
+  * Fix sanitizer build on 32bit time_t64 architectures.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 11 Mar 2024 22:48:48 +0100
+
 llvm-toolchain-16 (1:16.0.6-22) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/patches/libsanitizer-timebits.diff b/debian/patches/libsanitizer-timebits.diff
index f5ee919a..9a42afab 100644
--- a/debian/patches/libsanitizer-timebits.diff
+++ b/debian/patches/libsanitizer-timebits.diff
@@ -10,13 +10,13 @@
  #include "sanitizer_platform.h"
  #if SANITIZER_SOLARIS
  #  include <fcntl.h>
-#--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-#+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-#@@ -18,6 +18,7 @@
-# // depends on _FILE_OFFSET_BITS setting.
-# // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
-# #undef _FILE_OFFSET_BITS
-#+#undef _TIME_BITS
-# #endif
-# 
-# // Must go after undef _FILE_OFFSET_BITS.
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -18,6 +18,7 @@
+ // depends on _FILE_OFFSET_BITS setting.
+ // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
+ #undef _FILE_OFFSET_BITS
++#undef _TIME_BITS
+ #endif
+ 
+ // Must go after undef _FILE_OFFSET_BITS.

From ae4896c64dcb5a23a65e622b1f63e59b58dd7a9c Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sat, 16 Mar 2024 20:08:16 +0100
Subject: [PATCH 329/349]   * Add a stage1 profile to disable curl, grpc and
 spirv.

---
 debian/changelog  |  1 +
 debian/control    | 10 +++++-----
 debian/control.in | 10 +++++-----
 debian/rules      | 10 ++++++++--
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e56bd3ac..67f80e94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ llvm-toolchain-17 (1:17.0.6-9) unstable; urgency=medium
   * Make libclang-common-17-dev architecture dependent.
   * Fix sanitizer build on 32bit time_t64 architectures.
   * Enable compiler-rt runtime again for 32bit time_t64 architectures.
+  * Add a stage1 profile to disable curl, grpc and spirv.
 
  -- Matthias Klose <doko@debian.org>  Fri, 08 Mar 2024 14:52:29 +0100
 
diff --git a/debian/control b/debian/control
index a489081f..6e7dc583 100644
--- a/debian/control
+++ b/debian/control
@@ -27,11 +27,11 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello,
     spirv-tools [linux-any] | hello [!i386],
     wasi-libc | hello,
-    libcurl4-openssl-dev | libcurl-dev,
-    libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x]
+    libcurl4-openssl-dev <!stage1> | libcurl-dev <!stage1>,
+    libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
 # "| hello" is for older buster/bionic distros without spirv support
 Build-Conflicts: oprofile
 Standards-Version: 4.6.2
diff --git a/debian/control.in b/debian/control.in
index 2fdf5e56..396c010f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -27,11 +27,11 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello,
     spirv-tools [linux-any] | hello [!i386],
     wasi-libc | hello,
-    libcurl4-openssl-dev | libcurl-dev,
-    libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x]
+    libcurl4-openssl-dev <!stage1> | libcurl-dev <!stage1>,
+    libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
 # "| hello" is for older buster/bionic distros without spirv support
 Build-Conflicts: oprofile
 Standards-Version: 4.6.2
diff --git a/debian/rules b/debian/rules
index 202e860d..d45c173b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -158,6 +158,7 @@ STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH)
 # clangd remote index support requires GRPC & protobuf.
 # Enable if minimum tested versions are available.
 CLANGD_GRPC_INSTALLED=no
+ifeq (,$(filter stage1, $(DEB_BUILD_PROFILES)))
 ifeq ($(shell v=$$(dpkg-query -W -f '$${Version}' libgrpc++-dev 2>/dev/null); if [ -z "$$v" ]; then echo 1; else dpkg --compare-versions $$v gt 1.30.0; echo $$?; fi),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler-grpc) gt 1.30.0; echo $$?),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libprotobuf-dev) gt 3.12.0; echo $$?),0)
@@ -168,6 +169,7 @@ endif
 endif
 endif
 endif
+endif
 
 export CC=gcc-$(GCC_VERSION)
 export CXX=g++-$(GCC_VERSION)
@@ -266,6 +268,9 @@ else
 	control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
 endif
 
+ifneq (,$(filter stage1, $(DEB_BUILD_PROFILES)))
+	LLVM_SPIRV_INSTALLED = no
+else
 LLVM_SPIRV_VERSION := $(LLVM_VERSION)
 LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null)
 ifndef LLVM_SPIRV
@@ -287,6 +292,7 @@ else
 		LLVM_SPIRV_INSTALLED = yes
 	endif
 endif
+endif
 
 LIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl
 LIBCLC_LLVM_SPIRV =
@@ -746,7 +752,7 @@ endif
 	-DLLVM_INCLUDE_GO_TESTS=OFF \
 	-DLLVM_USE_RELATIVE_PATHS_IN_FILES=ON \
 	-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
-	-DLLVM_ENABLE_CURL=ON \
+	-DLLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \
 	-DLLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO=ON \
 	-DCLANG_PLUGIN_SUPPORT=OFF \
 	-DCLANG_BUILD_EXAMPLES=OFF \
@@ -799,7 +805,7 @@ endif
 	-DBOOTSTRAP_LLVM_POLLY_LINK_INTO_TOOLS=ON \
 	-DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa" \
 	-DBOOTSTRAP_LLVM_LINK_LLVM_DYLIB=ON \
-	-DBOOTSTRAP_LLVM_ENABLE_CURL=ON \
+	-DBOOTSTRAP_LLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \
 	-DBOOTSTRAP_CLANG_LINK_CLANG_DYLIB=ON \
 	-DBOOTSTRAP_LIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \
 	-DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \

From ea652fb717df6e16550bfaed47f52eb7d323f3cd Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sat, 16 Mar 2024 20:34:07 +0100
Subject: [PATCH 330/349]   * Build with --as-needed.

---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 67f80e94..bd99fccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ llvm-toolchain-17 (1:17.0.6-9) unstable; urgency=medium
   * Fix sanitizer build on 32bit time_t64 architectures.
   * Enable compiler-rt runtime again for 32bit time_t64 architectures.
   * Add a stage1 profile to disable curl, grpc and spirv.
+  * Build with --as-needed.
 
  -- Matthias Klose <doko@debian.org>  Fri, 08 Mar 2024 14:52:29 +0100
 
diff --git a/debian/rules b/debian/rules
index d45c173b..e49342af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ include /usr/share/dpkg/buildflags.mk
 # collect additional flags for all stages all builds
 CFLAGS_EXTRA = -Wno-unused-command-line-argument
 CXXFLAGS_EXTRA = -Wno-unused-command-line-argument
-LDFLAGS_EXTRA = -Wl,--build-id
+LDFLAGS_EXTRA = -Wl,--build-id,--as-needed
 
 # collect all flags for stage 1 toolchain build only
 STAGE_1_CFLAGS = $(CFLAGS) $(CFLAGS_EXTRA) $(CPPFLAGS)

From fdd54c6dbcaeab10189507ea993b33fa3c35e649 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sat, 16 Mar 2024 21:15:53 +0100
Subject: [PATCH 331/349] also add spriv-tools b-d to stage1

---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6e7dc583..5eb8f50c 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
 #    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
     llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello,
-    spirv-tools [linux-any] | hello [!i386],
+    spirv-tools [linux-any] <!stage1> | hello [!i386],
     wasi-libc | hello,
     libcurl4-openssl-dev <!stage1> | libcurl-dev <!stage1>,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
diff --git a/debian/control.in b/debian/control.in
index 396c010f..d918940a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
 #    llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] <!stage1> | hello [!i386],
     llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello,
-    spirv-tools [linux-any] | hello [!i386],
+    spirv-tools [linux-any] <!stage1> | hello [!i386],
     wasi-libc | hello,
     libcurl4-openssl-dev <!stage1> | libcurl-dev <!stage1>,
     libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,

From cff18adb3bd474eb4de400a0f43a1062a2b83303 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sat, 16 Mar 2024 22:16:18 +0100
Subject: [PATCH 332/349]   * Add a stage1 profile to disable curl, grpc and
 spirv.   * Build with --as-needed.

---
 debian/changelog  |  8 ++++++++
 debian/control    | 12 ++++++------
 debian/control.in | 12 ++++++------
 debian/rules      | 12 +++++++++---
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6098d29..c6f8d697 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+llvm-toolchain-16 (1:16.0.6-24) UNRELEASED; urgency=medium
+
+  [ Matthias Klose ]
+  * Add a stage1 profile to disable curl, grpc and spirv.
+  * Build with --as-needed.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 16 Mar 2024 22:12:22 +0100
+
 llvm-toolchain-16 (1:16.0.6-23) unstable; urgency=medium
 
   [ Matthias Klose ]
diff --git a/debian/control b/debian/control
index aa8c1d5d..9a8529e1 100644
--- a/debian/control
+++ b/debian/control
@@ -26,13 +26,13 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> |
     llvm-spirv-15 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
     llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello,
-    spirv-tools [ linux-any ] | hello [ !i386],
+    spirv-tools [ linux-any ] <!stage1> | hello [ !i386],
     wasi-libc | hello,
-    libcurl4-openssl-dev | libcurl-dev,
-    libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x]
+    libcurl4-openssl-dev <!stage1> | libcurl-dev <!stage1>,
+    libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
 # "| hello" is for older buster/bionic distros without spirv support
 Build-Conflicts: oprofile
 Standards-Version: 4.6.2
diff --git a/debian/control.in b/debian/control.in
index 0cf5a2c7..07a84747 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -26,13 +26,13 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> |
     llvm-spirv-15 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
     llvm-spirv-14 [ amd64 arm64 armel armhf i386 mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello,
-    spirv-tools [ linux-any ] | hello [ !i386],
+    spirv-tools [ linux-any ] <!stage1> | hello [ !i386],
     wasi-libc | hello,
-    libcurl4-openssl-dev | libcurl-dev,
-    libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
-    protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x]
+    libcurl4-openssl-dev <!stage1> | libcurl-dev <!stage1>,
+    libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
+    protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] <!stage1>,
 # "| hello" is for older buster/bionic distros without spirv support
 Build-Conflicts: oprofile
 Standards-Version: 4.6.2
diff --git a/debian/rules b/debian/rules
index a437a8de..63da6d0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ include /usr/share/dpkg/buildflags.mk
 # collect additional flags for all stages all builds
 CFLAGS_EXTRA = -Wno-unused-command-line-argument
 CXXFLAGS_EXTRA = -Wno-unused-command-line-argument
-LDFLAGS_EXTRA = -Wl,--build-id
+LDFLAGS_EXTRA = -Wl,--build-id,--as-needed
 
 # collect all flags for stage 1 toolchain build only
 STAGE_1_CFLAGS = $(CFLAGS) $(CFLAGS_EXTRA) $(CPPFLAGS)
@@ -137,6 +137,7 @@ STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH)
 # clangd remote index support requires GRPC & protobuf.
 # Enable if minimum tested versions are available.
 CLANGD_GRPC_INSTALLED=no
+ifeq (,$(filter stage1, $(DEB_BUILD_PROFILES)))
 ifeq ($(shell v=$$(dpkg-query -W -f '$${Version}' libgrpc++-dev 2>/dev/null); if [ -z "$$v" ]; then echo 1; else dpkg --compare-versions $$v gt 1.30.0; echo $$?; fi),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler-grpc) gt 1.30.0; echo $$?),0)
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libprotobuf-dev) gt 3.12.0; echo $$?),0)
@@ -147,6 +148,7 @@ endif
 endif
 endif
 endif
+endif
 
 export CC=gcc-$(GCC_VERSION)
 export CXX=g++-$(GCC_VERSION)
@@ -252,6 +254,9 @@ else
 	control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
 endif
 
+ifneq (,$(filter stage1, $(DEB_BUILD_PROFILES)))
+	LLVM_SPIRV_INSTALLED = no
+else
 LLVM_SPIRV_VERSION := $(LLVM_VERSION)
 LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null)
 ifndef LLVM_SPIRV
@@ -273,6 +278,7 @@ else
 		LLVM_SPIRV_INSTALLED = yes
 	endif
 endif
+endif
 
 LIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl
 LIBCLC_LLVM_SPIRV =
@@ -675,7 +681,7 @@ endif
 	-DLLVM_INCLUDE_GO_TESTS=OFF \
 	-DLLVM_USE_RELATIVE_PATHS_IN_FILES=ON \
 	-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
-	-DLLVM_ENABLE_CURL=ON \
+	-DLLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \
 	-DLLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO=ON \
 	-DCLANG_PLUGIN_SUPPORT=OFF \
 	-DCLANG_BUILD_EXAMPLES=OFF \
@@ -727,7 +733,7 @@ endif
 	-DBOOTSTRAP_LLVM_POLLY_LINK_INTO_TOOLS=ON \
 	-DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa" \
 	-DBOOTSTRAP_LLVM_LINK_LLVM_DYLIB=ON \
-	-DBOOTSTRAP_LLVM_ENABLE_CURL=ON \
+	-DBOOTSTRAP_LLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \
 	-DBOOTSTRAP_CLANG_LINK_CLANG_DYLIB=ON \
 	-DBOOTSTRAP_LIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \
 	-DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \

From c9847d7ab55ed225de2dddc585591d6315bcc573 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sat, 16 Mar 2024 22:18:17 +0100
Subject: [PATCH 333/349]   * ASan: move allocator base to avoid conflict with
 high-entropy ASLR     for x86-64 Linux. Patch taken from LLVM 17.

---
 debian/changelog                              |  2 ++
 ...7ca05ffb4f8e666878f2f6718a9fb4d686839.diff | 22 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 debian/patches/fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff

diff --git a/debian/changelog b/debian/changelog
index c6f8d697..7869a327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ llvm-toolchain-16 (1:16.0.6-24) UNRELEASED; urgency=medium
   [ Matthias Klose ]
   * Add a stage1 profile to disable curl, grpc and spirv.
   * Build with --as-needed.
+  * ASan: move allocator base to avoid conflict with high-entropy ASLR
+    for x86-64 Linux. Patch taken from LLVM 17.
 
  -- Matthias Klose <doko@debian.org>  Sat, 16 Mar 2024 22:12:22 +0100
 
diff --git a/debian/patches/fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff b/debian/patches/fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff
new file mode 100644
index 00000000..ff9a4ec1
--- /dev/null
+++ b/debian/patches/fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff
@@ -0,0 +1,22 @@
+diff --git a/compiler-rt/lib/asan/asan_allocator.h b/compiler-rt/lib/asan/asan_allocator.h
+index 0b4dbf03bb9d53..6a12a6c6025283 100644
+--- a/compiler-rt/lib/asan/asan_allocator.h
++++ b/compiler-rt/lib/asan/asan_allocator.h
+@@ -143,11 +143,15 @@ typedef DefaultSizeClassMap SizeClassMap;
+ const uptr kAllocatorSpace = ~(uptr)0;
+ const uptr kAllocatorSize  =  0x8000000000ULL;  // 500G
+ typedef DefaultSizeClassMap SizeClassMap;
+-# else
++#  elif SANITIZER_APPLE
+ const uptr kAllocatorSpace = 0x600000000000ULL;
+ const uptr kAllocatorSize  =  0x40000000000ULL;  // 4T.
+ typedef DefaultSizeClassMap SizeClassMap;
+-# endif
++#  else
++const uptr kAllocatorSpace = 0x500000000000ULL;
++const uptr kAllocatorSize = 0x40000000000ULL;  // 4T.
++typedef DefaultSizeClassMap SizeClassMap;
++#  endif
+ template <typename AddressSpaceViewTy>
+ struct AP64 {  // Allocator64 parameters. Deliberately using a short name.
+   static const uptr kSpaceBeg = kAllocatorSpace;
diff --git a/debian/patches/series b/debian/patches/series
index 87ae970c..a7d5b0ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -156,3 +156,4 @@ D158066-simd-ppc64el.patch
 D142688-loong64.diff
 remove-unused-imp-module.diff
 libsanitizer-timebits.diff
+fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff

From 357cf918d740d41605cf0f3abe39ece140bc9eca Mon Sep 17 00:00:00 2001
From: chenli <chenli@loongson.cn>
Date: Tue, 19 Mar 2024 18:36:23 +0800
Subject: [PATCH 334/349] Revert D154931 on loong64

D154931[1] needs to be reverted on LLVM17. As Loongson SIMD Extension
(LSX) and Loongson Advanced SIMD Extension(LASX) are not fully
supported on LLVM17, InlineAsm for LSX and LASX should not be
supported as well. Otherwise it leads to the following issue[2]:
'''
LLVM ERROR: Cannot select: 0x7ffea41a3650: ch = store<(store (s128) into %ir.mask
store52)> 0x7ffea41a35e0, 0x7ffea4196a30, FrameIndex:i64<6>, undef:i64
'''

LSX and LASX are fully supported on LLVM18 and are not supported on LLVM16,
thus only LLVM17 has the problem.

[1] https://reviews.llvm.org/D154931
[2] https://buildd.debian.org/status/fetch.php?pkg=qtdeclarative-opensource-src&arch=loong64&ver=5.15.10%2Bdfsg-2%2Bb1&stamp=1710571569&raw=0
---
 debian/patches/D154931-revert-loong64.patch | 468 ++++++++++++++++++++
 debian/patches/series                       |   1 +
 2 files changed, 469 insertions(+)
 create mode 100644 debian/patches/D154931-revert-loong64.patch

diff --git a/debian/patches/D154931-revert-loong64.patch b/debian/patches/D154931-revert-loong64.patch
new file mode 100644
index 00000000..91d7b35b
--- /dev/null
+++ b/debian/patches/D154931-revert-loong64.patch
@@ -0,0 +1,468 @@
+From 7236a15338bafc4bb4c6e61d4b151e0b9cc85448 Mon Sep 17 00:00:00 2001
+From: chenli <chenli@loongson.cn>
+Date: Mon, 18 Mar 2024 15:16:34 +0800
+Subject: [PATCH] Revert "[LoongArch] Support InlineAsm for LSX and LASX"
+
+This reverts commit d25c79dc70008b835312e5cc7ef48b199fda3165.
+
+D154931[1] needs to be reverted on LLVM17. As Loongson SIMD Extension(LSX) and
+Loongson Advanced SIMD Extension(LASX) are not fully supported on LLVM17,
+InlineAsm for LSX and LASX should not be supported as well. Otherwise it leads
+to the following issue[2]:
+'''
+LLVM ERROR: Cannot select: 0x7ffea41a3650: ch = store<(store (s128) into %ir.mask
+store52)> 0x7ffea41a35e0, 0x7ffea4196a30, FrameIndex:i64<6>, undef:i64
+'''
+
+LSX and LASX are fully supported on LLVM18 and are not supported on LLVM16,
+thus only LLVM17 has the problem.
+
+[1] https://reviews.llvm.org/D154931
+[2] https://buildd.debian.org/status/fetch.php?pkg=qtdeclarative-opensource-src&arch=loong64&ver=5.15.10%2Bdfsg-2%2Bb1&stamp=1710571569&raw=0
+
+Change-Id: I2bd74a71fe5f0bcadeb04ecf1d63d9f97765e8b5
+---
+ clang/lib/Basic/Targets/LoongArch.cpp         | 12 +---
+ .../lasx/inline-asm-gcc-regs-error.c          | 10 ----
+ .../LoongArch/lasx/inline-asm-gcc-regs.c      | 36 ------------
+ .../lasx/inline-asm-operand-modifier.c        | 15 -----
+ .../LoongArch/lsx/inline-asm-gcc-regs-error.c | 10 ----
+ .../LoongArch/lsx/inline-asm-gcc-regs.c       | 36 ------------
+ .../lsx/inline-asm-operand-modifier.c         | 15 -----
+ .../Target/LoongArch/LoongArchAsmPrinter.cpp  | 14 -----
+ .../LoongArch/LoongArchISelLowering.cpp       | 17 +-----
+ .../lasx/inline-asm-operand-modifier.ll       | 14 -----
+ .../LoongArch/lasx/inline-asm-reg-names.ll    | 58 -------------------
+ .../lsx/inline-asm-operand-modifier.ll        | 14 -----
+ .../LoongArch/lsx/inline-asm-reg-names.ll     | 58 -------------------
+ 13 files changed, 2 insertions(+), 307 deletions(-)
+ delete mode 100644 clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs-error.c
+ delete mode 100644 clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs.c
+ delete mode 100644 clang/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.c
+ delete mode 100644 clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs-error.c
+ delete mode 100644 clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs.c
+ delete mode 100644 clang/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.c
+ delete mode 100644 llvm/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.ll
+ delete mode 100644 llvm/test/CodeGen/LoongArch/lasx/inline-asm-reg-names.ll
+ delete mode 100644 llvm/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.ll
+ delete mode 100644 llvm/test/CodeGen/LoongArch/lsx/inline-asm-reg-names.ll
+
+diff --git a/clang/lib/Basic/Targets/LoongArch.cpp b/clang/lib/Basic/Targets/LoongArch.cpp
+index 4448a2ae10a1..96ef29620eb6 100644
+--- a/clang/lib/Basic/Targets/LoongArch.cpp
++++ b/clang/lib/Basic/Targets/LoongArch.cpp
+@@ -33,17 +33,7 @@ ArrayRef<const char *> LoongArchTargetInfo::getGCCRegNames() const {
+       "$f19", "$f20", "$f21", "$f22", "$f23", "$f24", "$f25", "$f26", "$f27",
+       "$f28", "$f29", "$f30", "$f31",
+       // Condition flag registers.
+-      "$fcc0", "$fcc1", "$fcc2", "$fcc3", "$fcc4", "$fcc5", "$fcc6", "$fcc7",
+-      // 128-bit vector registers.
+-      "$vr0", "$vr1", "$vr2", "$vr3", "$vr4", "$vr5", "$vr6", "$vr7", "$vr8",
+-      "$vr9", "$vr10", "$vr11", "$vr12", "$vr13", "$vr14", "$vr15", "$vr16",
+-      "$vr17", "$vr18", "$vr19", "$vr20", "$vr21", "$vr22", "$vr23", "$vr24",
+-      "$vr25", "$vr26", "$vr27", "$vr28", "$vr29", "$vr30", "$vr31",
+-      // 256-bit vector registers.
+-      "$xr0", "$xr1", "$xr2", "$xr3", "$xr4", "$xr5", "$xr6", "$xr7", "$xr8",
+-      "$xr9", "$xr10", "$xr11", "$xr12", "$xr13", "$xr14", "$xr15", "$xr16",
+-      "$xr17", "$xr18", "$xr19", "$xr20", "$xr21", "$xr22", "$xr23", "$xr24",
+-      "$xr25", "$xr26", "$xr27", "$xr28", "$xr29", "$xr30", "$xr31"};
++      "$fcc0", "$fcc1", "$fcc2", "$fcc3", "$fcc4", "$fcc5", "$fcc6", "$fcc7"};
+   return llvm::ArrayRef(GCCRegNames);
+ }
+ 
+diff --git a/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs-error.c b/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs-error.c
+deleted file mode 100644
+index 1fd602574b8e..000000000000
+--- a/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs-error.c
++++ /dev/null
+@@ -1,10 +0,0 @@
+-// RUN: not %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s 2>&1 -o - | FileCheck %s
+-
+-typedef signed char v32i8 __attribute__((vector_size(32), aligned(32)));
+-
+-void test() {
+-// CHECK: :[[#@LINE+1]]:28: error: unknown register name 'xr0' in asm
+-    register v32i8 p0 asm ("xr0");
+-// CHECK: :[[#@LINE+1]]:29: error: unknown register name '$xr32' in asm
+-    register v32i8 p32 asm ("$xr32");
+-}
+diff --git a/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs.c b/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs.c
+deleted file mode 100644
+index ed1a9660a06c..000000000000
+--- a/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs.c
++++ /dev/null
+@@ -1,36 +0,0 @@
+-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --filter "^define |tail call"
+-// RUN: %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s -o - | FileCheck %s
+-
+-typedef signed char v32i8 __attribute__((vector_size(32), aligned(32)));
+-
+-// CHECK-LABEL: @test_xr0(
+-// CHECK:    tail call void asm sideeffect "", "{$xr0}"(<32 x i8> undef) #[[ATTR1:[0-9]+]], !srcloc !2
+-//
+-void test_xr0() {
+-    register v32i8 a asm ("$xr0");
+-    asm ("" :: "f"(a));
+-}
+-
+-// CHECK-LABEL: @test_xr7(
+-// CHECK:    tail call void asm sideeffect "", "{$xr7}"(<32 x i8> undef) #[[ATTR1]], !srcloc !3
+-//
+-void test_xr7() {
+-    register v32i8 a asm ("$xr7");
+-    asm ("" :: "f"(a));
+-}
+-
+-// CHECK-LABEL: @test_xr15(
+-// CHECK:    tail call void asm sideeffect "", "{$xr15}"(<32 x i8> undef) #[[ATTR1]], !srcloc !4
+-//
+-void test_xr15() {
+-    register v32i8 a asm ("$xr15");
+-    asm ("" :: "f"(a));
+-}
+-
+-// CHECK-LABEL: @test_xr31(
+-// CHECK:    tail call void asm sideeffect "", "{$xr31}"(<32 x i8> undef) #[[ATTR1]], !srcloc !5
+-//
+-void test_xr31() {
+-    register v32i8 a asm ("$xr31");
+-    asm ("" :: "f"(a));
+-}
+diff --git a/clang/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.c b/clang/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.c
+deleted file mode 100644
+index a5cc8798fd66..000000000000
+--- a/clang/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.c
++++ /dev/null
+@@ -1,15 +0,0 @@
+-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 2
+-// RUN: %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s -o - | FileCheck %s
+-
+-typedef long long v4i64 __attribute__ ((vector_size(32), aligned(32)));
+-
+-// CHECK-LABEL: define dso_local void @test_u
+-// CHECK-SAME: () local_unnamed_addr #[[ATTR0:[0-9]+]] {
+-// CHECK-NEXT:  entry:
+-// CHECK-NEXT:    [[TMP0:%.*]] = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "=f"() #[[ATTR1:[0-9]+]], !srcloc !2
+-// CHECK-NEXT:    ret void
+-//
+-void test_u() {
+-  v4i64 v4i64_r;
+-  asm volatile ("xvldi %u0, 1" : "=f" (v4i64_r));
+-}
+diff --git a/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs-error.c b/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs-error.c
+deleted file mode 100644
+index 54132307e93f..000000000000
+--- a/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs-error.c
++++ /dev/null
+@@ -1,10 +0,0 @@
+-// RUN: not %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s 2>&1 -o - | FileCheck %s
+-
+-typedef signed char v16i8 __attribute__((vector_size(16), aligned(16)));
+-
+-void test() {
+-// CHECK: :[[#@LINE+1]]:28: error: unknown register name 'vr0' in asm
+-    register v16i8 p0 asm ("vr0");
+-// CHECK: :[[#@LINE+1]]:29: error: unknown register name '$vr32' in asm
+-    register v16i8 p32 asm ("$vr32");
+-}
+diff --git a/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs.c b/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs.c
+deleted file mode 100644
+index b05b1c8c15fa..000000000000
+--- a/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs.c
++++ /dev/null
+@@ -1,36 +0,0 @@
+-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --filter "^define |tail call"
+-// RUN: %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s -o - | FileCheck %s
+-
+-typedef signed char v16i8 __attribute__((vector_size(16), aligned(16)));
+-
+-// CHECK-LABEL: @test_vr0(
+-// CHECK:    tail call void asm sideeffect "", "{$vr0}"(<16 x i8> undef) #[[ATTR1:[0-9]+]], !srcloc !2
+-//
+-void test_vr0() {
+-    register v16i8 a asm ("$vr0");
+-    asm ("" :: "f"(a));
+-}
+-
+-// CHECK-LABEL: @test_vr7(
+-// CHECK:    tail call void asm sideeffect "", "{$vr7}"(<16 x i8> undef) #[[ATTR1]], !srcloc !3
+-//
+-void test_vr7() {
+-    register v16i8 a asm ("$vr7");
+-    asm ("" :: "f"(a));
+-}
+-
+-// CHECK-LABEL: @test_vr15(
+-// CHECK:    tail call void asm sideeffect "", "{$vr15}"(<16 x i8> undef) #[[ATTR1]], !srcloc !4
+-//
+-void test_vr15() {
+-    register v16i8 a asm ("$vr15");
+-    asm ("" :: "f"(a));
+-}
+-
+-// CHECK-LABEL: @test_vr31(
+-// CHECK:    tail call void asm sideeffect "", "{$vr31}"(<16 x i8> undef) #[[ATTR1]], !srcloc !5
+-//
+-void test_vr31() {
+-    register v16i8 a asm ("$vr31");
+-    asm ("" :: "f"(a));
+-}
+diff --git a/clang/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.c b/clang/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.c
+deleted file mode 100644
+index 5e0fae984134..000000000000
+--- a/clang/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.c
++++ /dev/null
+@@ -1,15 +0,0 @@
+-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 2
+-// RUN: %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s -o - | FileCheck %s
+-
+-typedef long long v2i64 __attribute__ ((vector_size(16), aligned(16)));
+-
+-// CHECK-LABEL: define dso_local void @test_w
+-// CHECK-SAME: () local_unnamed_addr #[[ATTR0:[0-9]+]] {
+-// CHECK-NEXT:  entry:
+-// CHECK-NEXT:    [[TMP0:%.*]] = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "=f"() #[[ATTR1:[0-9]+]], !srcloc !2
+-// CHECK-NEXT:    ret void
+-//
+-void test_w() {
+-  v2i64 v2i64_r;
+-  asm volatile ("vldi %w0, 1" : "=f" (v2i64_r));
+-}
+diff --git a/llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp b/llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp
+index 27979a830b10..5cf0673df69a 100644
+--- a/llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp
++++ b/llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp
+@@ -75,20 +75,6 @@ bool LoongArchAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
+         return false;
+       }
+       break;
+-    case 'w': // Print LSX registers.
+-      if (MO.getReg().id() >= LoongArch::VR0 &&
+-          MO.getReg().id() <= LoongArch::VR31)
+-        break;
+-      // The modifier is 'w' but the operand is not an LSX register; Report an
+-      // unknown operand error.
+-      return true;
+-    case 'u': // Print LASX registers.
+-      if (MO.getReg().id() >= LoongArch::XR0 &&
+-          MO.getReg().id() <= LoongArch::XR31)
+-        break;
+-      // The modifier is 'u' but the operand is not an LASX register; Report an
+-      // unknown operand error.
+-      return true;
+       // TODO: handle other extra codes if any.
+     }
+   }
+diff --git a/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp b/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
+index db5961fc501a..488e1c7f3a76 100644
+--- a/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
++++ b/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
+@@ -53,14 +53,6 @@ LoongArchTargetLowering::LoongArchTargetLowering(const TargetMachine &TM,
+     addRegisterClass(MVT::f32, &LoongArch::FPR32RegClass);
+   if (Subtarget.hasBasicD())
+     addRegisterClass(MVT::f64, &LoongArch::FPR64RegClass);
+-  if (Subtarget.hasExtLSX())
+-    for (auto VT : {MVT::v4f32, MVT::v2f64, MVT::v16i8, MVT::v8i16, MVT::v4i32,
+-                    MVT::v2i64})
+-      addRegisterClass(VT, &LoongArch::LSX128RegClass);
+-  if (Subtarget.hasExtLASX())
+-    for (auto VT : {MVT::v8f32, MVT::v4f64, MVT::v32i8, MVT::v16i16, MVT::v8i32,
+-                    MVT::v4i64})
+-      addRegisterClass(VT, &LoongArch::LASX256RegClass);
+ 
+   setLoadExtAction({ISD::EXTLOAD, ISD::SEXTLOAD, ISD::ZEXTLOAD}, GRLenVT,
+                    MVT::i1, Promote);
+@@ -3056,12 +3048,6 @@ LoongArchTargetLowering::getRegForInlineAsmConstraint(
+         return std::make_pair(0U, &LoongArch::FPR32RegClass);
+       if (Subtarget.hasBasicD() && VT == MVT::f64)
+         return std::make_pair(0U, &LoongArch::FPR64RegClass);
+-      if (Subtarget.hasExtLSX() &&
+-          TRI->isTypeLegalForClass(LoongArch::LSX128RegClass, VT))
+-        return std::make_pair(0U, &LoongArch::LSX128RegClass);
+-      if (Subtarget.hasExtLASX() &&
+-          TRI->isTypeLegalForClass(LoongArch::LASX256RegClass, VT))
+-        return std::make_pair(0U, &LoongArch::LASX256RegClass);
+       break;
+     default:
+       break;
+@@ -3079,8 +3065,7 @@ LoongArchTargetLowering::getRegForInlineAsmConstraint(
+   // decode the usage of register name aliases into their official names. And
+   // AFAIK, the not yet upstreamed `rustc` for LoongArch will always use
+   // official register names.
+-  if (Constraint.startswith("{$r") || Constraint.startswith("{$f") ||
+-      Constraint.startswith("{$vr") || Constraint.startswith("{$xr")) {
++  if (Constraint.startswith("{$r") || Constraint.startswith("{$f")) {
+     bool IsFP = Constraint[2] == 'f';
+     std::pair<StringRef, StringRef> Temp = Constraint.split('$');
+     std::pair<unsigned, const TargetRegisterClass *> R;
+diff --git a/llvm/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.ll b/llvm/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.ll
+deleted file mode 100644
+index 201e34c8b5ae..000000000000
+--- a/llvm/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.ll
++++ /dev/null
+@@ -1,14 +0,0 @@
+-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2
+-; RUN: llc --mtriple=loongarch64 --mattr=+lasx < %s | FileCheck %s
+-
+-define void @test_u() nounwind {
+-; CHECK-LABEL: test_u:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    xvldi $xr0, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "=f"()
+-  ret void
+-}
+diff --git a/llvm/test/CodeGen/LoongArch/lasx/inline-asm-reg-names.ll b/llvm/test/CodeGen/LoongArch/lasx/inline-asm-reg-names.ll
+deleted file mode 100644
+index dd400ecfcf91..000000000000
+--- a/llvm/test/CodeGen/LoongArch/lasx/inline-asm-reg-names.ll
++++ /dev/null
+@@ -1,58 +0,0 @@
+-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2
+-; RUN: llc --mtriple=loongarch64 --mattr=+lasx < %s | FileCheck %s
+-
+-define void @register_xr1() nounwind {
+-; CHECK-LABEL: register_xr1:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    xvldi $xr1, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "={$xr1}"()
+-  ret void
+-}
+-
+-define void @register_xr7() nounwind {
+-; CHECK-LABEL: register_xr7:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    xvldi $xr7, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "={$xr7}"()
+-  ret void
+-}
+-
+-define void @register_xr23() nounwind {
+-; CHECK-LABEL: register_xr23:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    xvldi $xr23, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "={$xr23}"()
+-  ret void
+-}
+-
+-;; The lower 64-bit of the vector register '$xr31' is overlapped with
+-;; the floating-point register '$f31' ('$fs7'). And '$f31' ('$fs7')
+-;; is a callee-saved register which is preserved across calls.
+-;; That's why the fst.d and fld.d instructions are emitted.
+-define void @register_xr31() nounwind {
+-; CHECK-LABEL: register_xr31:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    addi.d $sp, $sp, -16
+-; CHECK-NEXT:    fst.d $fs7, $sp, 8 # 8-byte Folded Spill
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    xvldi $xr31, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    fld.d $fs7, $sp, 8 # 8-byte Folded Reload
+-; CHECK-NEXT:    addi.d $sp, $sp, 16
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "={$xr31}"()
+-  ret void
+-}
+diff --git a/llvm/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.ll b/llvm/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.ll
+deleted file mode 100644
+index c46e624ddaa8..000000000000
+--- a/llvm/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.ll
++++ /dev/null
+@@ -1,14 +0,0 @@
+-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2
+-; RUN: llc --mtriple=loongarch64 --mattr=+lsx < %s | FileCheck %s
+-
+-define void @test_w() nounwind {
+-; CHECK-LABEL: test_w:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    vldi $vr0, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "=f"()
+-  ret void
+-}
+diff --git a/llvm/test/CodeGen/LoongArch/lsx/inline-asm-reg-names.ll b/llvm/test/CodeGen/LoongArch/lsx/inline-asm-reg-names.ll
+deleted file mode 100644
+index ceea3621be2f..000000000000
+--- a/llvm/test/CodeGen/LoongArch/lsx/inline-asm-reg-names.ll
++++ /dev/null
+@@ -1,58 +0,0 @@
+-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2
+-; RUN: llc --mtriple=loongarch64 --mattr=+lsx < %s | FileCheck %s
+-
+-define void @register_vr1() nounwind {
+-; CHECK-LABEL: register_vr1:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    vldi $vr1, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "={$vr1}"()
+-  ret void
+-}
+-
+-define void @register_vr7() nounwind {
+-; CHECK-LABEL: register_vr7:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    vldi $vr7, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "={$vr7}"()
+-  ret void
+-}
+-
+-define void @register_vr23() nounwind {
+-; CHECK-LABEL: register_vr23:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    vldi $vr23, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "={$vr23}"()
+-  ret void
+-}
+-
+-;; The lower half of the vector register '$vr31' is overlapped with
+-;; the floating-point register '$f31'. And '$f31' is a callee-saved
+-;; register which is preserved across calls. That's why the
+-;; fst.d and fld.d instructions are emitted.
+-define void @register_vr31() nounwind {
+-; CHECK-LABEL: register_vr31:
+-; CHECK:       # %bb.0: # %entry
+-; CHECK-NEXT:    addi.d $sp, $sp, -16
+-; CHECK-NEXT:    fst.d $fs7, $sp, 8 # 8-byte Folded Spill
+-; CHECK-NEXT:    #APP
+-; CHECK-NEXT:    vldi $vr31, 1
+-; CHECK-NEXT:    #NO_APP
+-; CHECK-NEXT:    fld.d $fs7, $sp, 8 # 8-byte Folded Reload
+-; CHECK-NEXT:    addi.d $sp, $sp, 16
+-; CHECK-NEXT:    ret
+-entry:
+-  %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "={$vr31}"()
+-  ret void
+-}
+-- 
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 596101d2..257a14a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -153,3 +153,4 @@ D148945-revert.diff
 arm32-defaults.diff
 mips/D154390-pre-R6.diff
 libsanitizer-timebits.diff
+D154931-revert-loong64.patch

From d6a9730e1583c8b6988190ebb8f4eeba228a1ab6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 21 Mar 2024 08:34:32 +0100
Subject: [PATCH 335/349]  rename the patch for something more explicit

---
 ...7ca05ffb4f8e666878f2f6718a9fb4d686839.diff | 22 -------------------
 debian/patches/series                         |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 debian/patches/fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff

diff --git a/debian/patches/fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff b/debian/patches/fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff
deleted file mode 100644
index ff9a4ec1..00000000
--- a/debian/patches/fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/compiler-rt/lib/asan/asan_allocator.h b/compiler-rt/lib/asan/asan_allocator.h
-index 0b4dbf03bb9d53..6a12a6c6025283 100644
---- a/compiler-rt/lib/asan/asan_allocator.h
-+++ b/compiler-rt/lib/asan/asan_allocator.h
-@@ -143,11 +143,15 @@ typedef DefaultSizeClassMap SizeClassMap;
- const uptr kAllocatorSpace = ~(uptr)0;
- const uptr kAllocatorSize  =  0x8000000000ULL;  // 500G
- typedef DefaultSizeClassMap SizeClassMap;
--# else
-+#  elif SANITIZER_APPLE
- const uptr kAllocatorSpace = 0x600000000000ULL;
- const uptr kAllocatorSize  =  0x40000000000ULL;  // 4T.
- typedef DefaultSizeClassMap SizeClassMap;
--# endif
-+#  else
-+const uptr kAllocatorSpace = 0x500000000000ULL;
-+const uptr kAllocatorSize = 0x40000000000ULL;  // 4T.
-+typedef DefaultSizeClassMap SizeClassMap;
-+#  endif
- template <typename AddressSpaceViewTy>
- struct AP64 {  // Allocator64 parameters. Deliberately using a short name.
-   static const uptr kSpaceBeg = kAllocatorSpace;
diff --git a/debian/patches/series b/debian/patches/series
index a7d5b0ba..888bad9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -156,4 +156,4 @@ D158066-simd-ppc64el.patch
 D142688-loong64.diff
 remove-unused-imp-module.diff
 libsanitizer-timebits.diff
-fb77ca05ffb4f8e666878f2f6718a9fb4d686839.diff
+asan-allocator.diff

From 42b3f8adc4fbb558ffa845e49ce66ec81b49284a Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 1 Apr 2024 10:33:56 +0200
Subject: [PATCH 336/349] Disable Loongson SIMD Extension (LSX) and Loongson
 Advanced SIMD Extension (LASX) on 17 (Closes: #1068169)

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bd99fccc..08756f77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-17 (1:17.0.6-10) unstable; urgency=medium
+
+  * Disable Loongson SIMD Extension (LSX) and Loongson
+    Advanced SIMD Extension (LASX) on 17 (Closes: #1068169)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 01 Apr 2024 10:33:46 +0200
+
 llvm-toolchain-17 (1:17.0.6-9) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]

From 084b3b80f4afa0cf69e66ab8d411edf65f207c90 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 14 Apr 2024 11:54:02 +0200
Subject: [PATCH 337/349] check in missing bits for 1:16.0.6-24

---
 debian/changelog                   |  2 +-
 debian/patches/asan-allocator.diff | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/asan-allocator.diff

diff --git a/debian/changelog b/debian/changelog
index 7869a327..2276d4c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-16 (1:16.0.6-24) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-24) unstable; urgency=medium
 
   [ Matthias Klose ]
   * Add a stage1 profile to disable curl, grpc and spirv.
diff --git a/debian/patches/asan-allocator.diff b/debian/patches/asan-allocator.diff
new file mode 100644
index 00000000..ff9a4ec1
--- /dev/null
+++ b/debian/patches/asan-allocator.diff
@@ -0,0 +1,22 @@
+diff --git a/compiler-rt/lib/asan/asan_allocator.h b/compiler-rt/lib/asan/asan_allocator.h
+index 0b4dbf03bb9d53..6a12a6c6025283 100644
+--- a/compiler-rt/lib/asan/asan_allocator.h
++++ b/compiler-rt/lib/asan/asan_allocator.h
+@@ -143,11 +143,15 @@ typedef DefaultSizeClassMap SizeClassMap;
+ const uptr kAllocatorSpace = ~(uptr)0;
+ const uptr kAllocatorSize  =  0x8000000000ULL;  // 500G
+ typedef DefaultSizeClassMap SizeClassMap;
+-# else
++#  elif SANITIZER_APPLE
+ const uptr kAllocatorSpace = 0x600000000000ULL;
+ const uptr kAllocatorSize  =  0x40000000000ULL;  // 4T.
+ typedef DefaultSizeClassMap SizeClassMap;
+-# endif
++#  else
++const uptr kAllocatorSpace = 0x500000000000ULL;
++const uptr kAllocatorSize = 0x40000000000ULL;  // 4T.
++typedef DefaultSizeClassMap SizeClassMap;
++#  endif
+ template <typename AddressSpaceViewTy>
+ struct AP64 {  // Allocator64 parameters. Deliberately using a short name.
+   static const uptr kSpaceBeg = kAllocatorSpace;

From 5a6bfc398768879999e3668548c9b2f3313a3156 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 14 Apr 2024 11:56:56 +0200
Subject: [PATCH 338/349]   * Fix libomp symbols file for t64.

---
 debian/changelog                 |  6 ++++++
 debian/libomp5-X.Yt64.symbols.in | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2276d4c4..a0afd184 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-16 (1:16.0.6-25) UNRELEASED; urgency=medium
+
+  * Fix libomp symbols file for t64.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 14 Apr 2024 11:55:50 +0200
+
 llvm-toolchain-16 (1:16.0.6-24) unstable; urgency=medium
 
   [ Matthias Klose ]
diff --git a/debian/libomp5-X.Yt64.symbols.in b/debian/libomp5-X.Yt64.symbols.in
index 350fcf19..5bd1c053 100644
--- a/debian/libomp5-X.Yt64.symbols.in
+++ b/debian/libomp5-X.Yt64.symbols.in
@@ -1344,7 +1344,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@t64 #MINVER#
  ompc_set_schedule@VERSION 0.20130412
  ompt_libomp_connect@VERSION 1:16.0.2-1~
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)ompt_start_tool@VERSION 6.0
-libomptarget.rtl.amdgpu.nextgen.so.16 libomp5-16 #MINVER# [amd64 arm64]
+libomptarget.rtl.amdgpu.nextgen.so.16 libomp5-@LLVM_VERSION@t64 #MINVER# [amd64 arm64]
  VERS1.0@VERS1.0 1:16.0.2-1~
  __tgt_rtl_create_event@VERS1.0 1:16.0.2-1~
  __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~
@@ -1379,7 +1379,7 @@ libomptarget.rtl.amdgpu.nextgen.so.16 libomp5-16 #MINVER# [amd64 arm64]
  __tgt_rtl_sync_event@VERS1.0 1:16.0.2-1~
  __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~
  __tgt_rtl_wait_event@VERS1.0 1:16.0.2-1~
-libomptarget.rtl.amdgpu.so.16 libomp5-16 #MINVER# [amd64 arm64]
+libomptarget.rtl.amdgpu.so.16 libomp5-@LLVM_VERSION@t64 #MINVER# [amd64 arm64]
  VERS1.0@VERS1.0 1:16.0.2-1~
  __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~
  __tgt_rtl_data_delete@VERS1.0 1:16.0.2-1~
@@ -1400,7 +1400,7 @@ libomptarget.rtl.amdgpu.so.16 libomp5-16 #MINVER# [amd64 arm64]
  __tgt_rtl_number_of_devices@VERS1.0 1:16.0.2-1~
  __tgt_rtl_print_device_info@VERS1.0 1:16.0.2-1~
  __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~
-libomptarget.rtl.cuda.nextgen.so.16 libomp5-16 #MINVER#
+libomptarget.rtl.cuda.nextgen.so.16 libomp5-@LLVM_VERSION@t64 #MINVER#
  VERS1.0@VERS1.0 1:16.0.2-1~
  __tgt_rtl_create_event@VERS1.0 1:16.0.2-1~
  __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~
@@ -1435,7 +1435,7 @@ libomptarget.rtl.cuda.nextgen.so.16 libomp5-16 #MINVER#
  __tgt_rtl_sync_event@VERS1.0 1:16.0.2-1~
  __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~
  __tgt_rtl_wait_event@VERS1.0 1:16.0.2-1~
-libomptarget.rtl.cuda.so.16 libomp5-16 #MINVER# [amd64 arm64]
+libomptarget.rtl.cuda.so.16 libomp5-@LLVM_VERSION@t64 #MINVER# [amd64 arm64]
  VERS1.0@VERS1.0 1:16.0.2-1~
  __tgt_rtl_create_event@VERS1.0 1:16.0.2-1~
  __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~
@@ -1470,7 +1470,7 @@ libomptarget.rtl.cuda.so.16 libomp5-16 #MINVER# [amd64 arm64]
  __tgt_rtl_sync_event@VERS1.0 1:16.0.2-1~
  __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~
  __tgt_rtl_wait_event@VERS1.0 1:16.0.2-1~
-libomptarget.rtl.x86_64.nextgen.so.16 libomp5-16 #MINVER# [amd64 arm64]
+libomptarget.rtl.x86_64.nextgen.so.16 libomp5-@LLVM_VERSION@t64 #MINVER# [amd64 arm64]
  VERS1.0@VERS1.0 1:16.0.2-1~
  __tgt_rtl_create_event@VERS1.0 1:16.0.2-1~
  __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~
@@ -1505,7 +1505,7 @@ libomptarget.rtl.x86_64.nextgen.so.16 libomp5-16 #MINVER# [amd64 arm64]
  __tgt_rtl_sync_event@VERS1.0 1:16.0.2-1~
  __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~
  __tgt_rtl_wait_event@VERS1.0 1:16.0.2-1~
-libomptarget.rtl.x86_64.so.16 libomp5-16 #MINVER# [amd64 arm64]
+libomptarget.rtl.x86_64.so.16 libomp5-@LLVM_VERSION@t64 #MINVER# [amd64 arm64]
  VERS1.0@VERS1.0 1:16.0.2-1~
  __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~
  __tgt_rtl_data_delete@VERS1.0 1:16.0.2-1~
@@ -1517,7 +1517,7 @@ libomptarget.rtl.x86_64.so.16 libomp5-16 #MINVER# [amd64 arm64]
  __tgt_rtl_load_binary@VERS1.0 1:16.0.2-1~
  __tgt_rtl_number_of_devices@VERS1.0 1:16.0.2-1~
  __tgt_rtl_print_device_info@VERS1.0 1:16.0.2-1~
-libomptarget.so.16 libomp5-16 #MINVER# [amd64 arm64]
+libomptarget.so.16 libomp5-@LLVM_VERSION@t64 #MINVER# [amd64 arm64]
  VERS1.0@VERS1.0 1:16.0.2-1~
  __kmpc_push_target_tripcount@VERS1.0 1:16.0.2-1~
  __kmpc_push_target_tripcount_mapper@VERS1.0 1:16.0.2-1~

From 8b318786ef954db7e3d0706c57b67114ac47dbc0 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 14 Apr 2024 12:01:49 +0200
Subject: [PATCH 339/349]   * Fix libomp symbols file for t64.

---
 debian/changelog                 | 6 ++++++
 debian/libomp5-X.Yt64.symbols.in | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08756f77..eb303b72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.6-11) UNRELEASED; urgency=medium
+
+  * Fix libomp symbols file for t64.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 14 Apr 2024 12:00:52 +0200
+
 llvm-toolchain-17 (1:17.0.6-10) unstable; urgency=medium
 
   * Disable Loongson SIMD Extension (LSX) and Loongson
diff --git a/debian/libomp5-X.Yt64.symbols.in b/debian/libomp5-X.Yt64.symbols.in
index dcc64e8c..b5b9986a 100644
--- a/debian/libomp5-X.Yt64.symbols.in
+++ b/debian/libomp5-X.Yt64.symbols.in
@@ -1345,7 +1345,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@t64 #MINVER#
  ompc_set_schedule@VERSION 0.20130412
  ompt_libomp_connect@VERSION 17
  (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)ompt_start_tool@VERSION 6.0
-libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
+libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@t64 #MINVER#
  VERS1.0@VERS1.0 17
  __tgt_rtl_create_event@VERS1.0 17
  __tgt_rtl_data_alloc@VERS1.0 17
@@ -1382,7 +1382,7 @@ libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
  __tgt_rtl_sync_event@VERS1.0 17
  __tgt_rtl_synchronize@VERS1.0 17
  __tgt_rtl_wait_event@VERS1.0 17
-libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
+libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@t64 #MINVER#
  VERS1.0@VERS1.0 17
  __tgt_rtl_create_event@VERS1.0 17
  __tgt_rtl_data_alloc@VERS1.0 17
@@ -1419,7 +1419,7 @@ libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
  __tgt_rtl_sync_event@VERS1.0 17
  __tgt_rtl_synchronize@VERS1.0 17
  __tgt_rtl_wait_event@VERS1.0 17
-libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
+libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@t64 #MINVER#
  VERS1.0@VERS1.0 17
  __tgt_rtl_create_event@VERS1.0 1:17.0.1-1
  __tgt_rtl_data_alloc@VERS1.0 17
@@ -1456,7 +1456,7 @@ libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
  __tgt_rtl_sync_event@VERS1.0 17
  __tgt_rtl_synchronize@VERS1.0 17
  __tgt_rtl_wait_event@VERS1.0 17
-libomptarget.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER#
+libomptarget.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@t64 #MINVER#
  VERS1.0@VERS1.0 17
  __kmpc_push_target_tripcount@VERS1.0 17
  __kmpc_push_target_tripcount_mapper@VERS1.0 17

From 8a58f6bd0e35f0d15a9d3ce02722bb2d5a01a42f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 24 Apr 2024 10:26:28 +0200
Subject: [PATCH 340/349] prepare upload

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a0afd184..4d4e2436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-16 (1:16.0.6-25) UNRELEASED; urgency=medium
+llvm-toolchain-16 (1:16.0.6-25) unstable; urgency=medium
 
   * Fix libomp symbols file for t64.
 

From 72f74dad49bc80f817842f93c70f2364c9579172 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 24 Apr 2024 12:21:46 +0200
Subject: [PATCH 341/349] Allow build on machines without too many CPU Thanks
 to Santiago Vila for the patch (Closes: #1067714)

---
 debian/changelog | 10 ++++++++--
 debian/rules     |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb303b72..fdf9ff45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-llvm-toolchain-17 (1:17.0.6-11) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.6-11) unstable; urgency=medium
 
+  [ Matthias Klose ]
   * Fix libomp symbols file for t64.
 
- -- Matthias Klose <doko@debian.org>  Sun, 14 Apr 2024 12:00:52 +0200
+  [ Sylvestre Ledru ]
+  * Allow build on machines without too many CPU
+    Thanks to Santiago Vila for the patch
+    (Closes: #1067714)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 24 Apr 2024 12:21:11 +0200
 
 llvm-toolchain-17 (1:17.0.6-10) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index e49342af..b7aefbc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,7 @@ else
 endif
 NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' /proc/meminfo`; \
 		awk -vn=$(NCPUS) -vmt=$$mt -vm=$(MEM_PER_CPU) \
-		  'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2<n+1 ? n2 : n+1}' < /dev/null)
+		  'END { mt/=1024; n2 = int(mt/m); print n==1 || n2<=1 ? 1 : n2<=n ? n2 : n }' < /dev/null)
 
 DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
 

From e915be9fdcf5fe38449a35bb20d2b915a342eb85 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 24 Apr 2024 16:26:54 +0200
Subject: [PATCH 342/349] upload done

---
 debian/changelog | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fdf9ff45..033ec1a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-17 (1:17.0.6-11) unstable; urgency=medium
+llvm-toolchain-17 (1:17.0.6-10) unstable; urgency=medium
 
   [ Matthias Klose ]
   * Fix libomp symbols file for t64.
@@ -7,15 +7,10 @@ llvm-toolchain-17 (1:17.0.6-11) unstable; urgency=medium
   * Allow build on machines without too many CPU
     Thanks to Santiago Vila for the patch
     (Closes: #1067714)
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 24 Apr 2024 12:21:11 +0200
-
-llvm-toolchain-17 (1:17.0.6-10) unstable; urgency=medium
-
   * Disable Loongson SIMD Extension (LSX) and Loongson
     Advanced SIMD Extension (LASX) on 17 (Closes: #1068169)
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 01 Apr 2024 10:33:46 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 24 Apr 2024 12:22:47 +0200
 
 llvm-toolchain-17 (1:17.0.6-9) unstable; urgency=medium
 

From b2515dbb99348d9203245bb9394b3f94a02765e2 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 25 Apr 2024 08:21:55 +0200
Subject: [PATCH 343/349] Show LDFLAGS_EXTRA when building

---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 63da6d0f..ac0f5225 100755
--- a/debian/rules
+++ b/debian/rules
@@ -553,6 +553,7 @@ preconfigure:
 	@echo "RUNTIMES_CXXFLAGS=$(RUNTIMES_CXXFLAGS)"
 	@echo "STAGE_1_CXXFLAGS=$(STAGE_1_CXXFLAGS)"
 	@echo "STAGE_2_CFLAGS=$(STAGE_2_CFLAGS)"
+	@echo "LDFLAGS_EXTRA=$(LDFLAGS_EXTRA)"
 	@echo "LIBFUZZER_ENABLE=$(LIBFUZZER_ENABLE)"
 	@echo "LTO_ENABLE=$(LTO_ENABLE)"
 	@echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)"

From bedad29d4933a9bf5188bd046541d27df5027909 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 27 Apr 2024 01:12:05 +0200
Subject: [PATCH 344/349] Disable --as-needed on armel

---
 debian/changelog | 6 ++++++
 debian/rules     | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4d4e2436..16f0bc4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-16 (1:16.0.6-26) unstable; urgency=medium
+
+  * Disable --as-needed on armel
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 27 Apr 2024 01:12:00 +0200
+
 llvm-toolchain-16 (1:16.0.6-25) unstable; urgency=medium
 
   * Fix libomp symbols file for t64.
diff --git a/debian/rules b/debian/rules
index ac0f5225..1f77ef40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,13 @@ include /usr/share/dpkg/buildflags.mk
 # collect additional flags for all stages all builds
 CFLAGS_EXTRA = -Wno-unused-command-line-argument
 CXXFLAGS_EXTRA = -Wno-unused-command-line-argument
+
+ifeq (,$(filter $(DEB_HOST_ARCH), armel))
 LDFLAGS_EXTRA = -Wl,--build-id,--as-needed
+else
+# fails on armel. we are getting some missing latomic
+LDFLAGS_EXTRA = -Wl,--build-id
+endif
 
 # collect all flags for stage 1 toolchain build only
 STAGE_1_CFLAGS = $(CFLAGS) $(CFLAGS_EXTRA) $(CPPFLAGS)

From b7d187e5e1f4a58e302bd02c6cd7f3b65d2924d0 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 27 Apr 2024 11:21:12 +0200
Subject: [PATCH 345/349]  remove 16 specific patches

---
 debian/patches/asan-allocator.diff           | 22 --------------------
 debian/patches/remove-unused-imp-module.diff | 10 ---------
 2 files changed, 32 deletions(-)
 delete mode 100644 debian/patches/asan-allocator.diff
 delete mode 100644 debian/patches/remove-unused-imp-module.diff

diff --git a/debian/patches/asan-allocator.diff b/debian/patches/asan-allocator.diff
deleted file mode 100644
index ff9a4ec1..00000000
--- a/debian/patches/asan-allocator.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/compiler-rt/lib/asan/asan_allocator.h b/compiler-rt/lib/asan/asan_allocator.h
-index 0b4dbf03bb9d53..6a12a6c6025283 100644
---- a/compiler-rt/lib/asan/asan_allocator.h
-+++ b/compiler-rt/lib/asan/asan_allocator.h
-@@ -143,11 +143,15 @@ typedef DefaultSizeClassMap SizeClassMap;
- const uptr kAllocatorSpace = ~(uptr)0;
- const uptr kAllocatorSize  =  0x8000000000ULL;  // 500G
- typedef DefaultSizeClassMap SizeClassMap;
--# else
-+#  elif SANITIZER_APPLE
- const uptr kAllocatorSpace = 0x600000000000ULL;
- const uptr kAllocatorSize  =  0x40000000000ULL;  // 4T.
- typedef DefaultSizeClassMap SizeClassMap;
--# endif
-+#  else
-+const uptr kAllocatorSpace = 0x500000000000ULL;
-+const uptr kAllocatorSize = 0x40000000000ULL;  // 4T.
-+typedef DefaultSizeClassMap SizeClassMap;
-+#  endif
- template <typename AddressSpaceViewTy>
- struct AP64 {  // Allocator64 parameters. Deliberately using a short name.
-   static const uptr kSpaceBeg = kAllocatorSpace;
diff --git a/debian/patches/remove-unused-imp-module.diff b/debian/patches/remove-unused-imp-module.diff
deleted file mode 100644
index 1553232f..00000000
--- a/debian/patches/remove-unused-imp-module.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/clang/tools/scan-view/bin/scan-view
-+++ b/clang/tools/scan-view/bin/scan-view
-@@ -6,7 +6,6 @@
- """
- 
- import sys
--import imp
- import os
- import posixpath
- import threading

From c7bde1a59804af5a969642223140a242d3b340cf Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 28 Apr 2024 18:00:25 +0200
Subject: [PATCH 346/349] prepare upload

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6b6c438b..c7f80bde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.6-11) unstable; urgency=medium
+
+  * Disable --as-needed on armel
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 28 Apr 2024 18:00:09 +0200
+
 llvm-toolchain-17 (1:17.0.6-10) unstable; urgency=medium
 
   [ Matthias Klose ]

From a3da2c49869b5bca60840def9bb3a931c4d6ce66 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 28 Apr 2024 18:04:42 +0200
Subject: [PATCH 347/349] Pass LLVM_EXPERIMENTAL_TARGETS_TO_BUILD to stage 1 to
 (try to) build M68k (Closes: #1067646)

---
 debian/changelog | 2 ++
 debian/rules     | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c7f80bde..9bcddf1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 llvm-toolchain-17 (1:17.0.6-11) unstable; urgency=medium
 
   * Disable --as-needed on armel
+  * Pass LLVM_EXPERIMENTAL_TARGETS_TO_BUILD to stage 1 to (try to) build M68k
+    (Closes: #1067646)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 28 Apr 2024 18:00:09 +0200
 
diff --git a/debian/rules b/debian/rules
index ebf99fd4..7ed1ba23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -566,6 +566,8 @@ ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clan
 PROJECTS_LIST := $(shell echo "$(PROJECTS)"|sed -e "s| ||g")
 RUNTIMES_LIST := $(shell echo "$(RUNTIMES)"|sed -e "s| ||g")
 
+EXPERIMENTAL_TARGETS="M68k;Xtensa"
+
 stamps/preconfigure:
 	if ! grep -qs '/proc ' /proc/mounts; then \
 		echo "/proc needs to be mounted"; \
@@ -791,6 +793,7 @@ endif
 	-DLIBOMP_ENABLE_RTTI=OFF \
 	-DLIBOMP_OMPT_SUPPORT=OFF \
 	-DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=ON \
+	-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="$(EXPERIMENTAL_TARGETS)" \
 	$(CMAKE_EXTRA) \
 	-DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
 	-DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
@@ -815,7 +818,7 @@ endif
 	-DBOOTSTRAP_LLVM_INSTALL_UTILS=ON \
 	-DBOOTSTRAP_LLVM_VERSION_SUFFIX= \
 	-DBOOTSTRAP_LLVM_POLLY_LINK_INTO_TOOLS=ON \
-	-DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa" \
+	-DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD="$(EXPERIMENTAL_TARGETS)" \
 	-DBOOTSTRAP_LLVM_LINK_LLVM_DYLIB=ON \
 	-DBOOTSTRAP_LLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \
 	-DBOOTSTRAP_CLANG_LINK_CLANG_DYLIB=ON \

From 8a0c9fcf8ec2e49399d8a64e4efb8463cfb5b342 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 28 Apr 2024 18:18:51 +0200
Subject: [PATCH 348/349]  fix syntax

---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7ed1ba23..8b11e427 100755
--- a/debian/rules
+++ b/debian/rules
@@ -793,7 +793,7 @@ endif
 	-DLIBOMP_ENABLE_RTTI=OFF \
 	-DLIBOMP_OMPT_SUPPORT=OFF \
 	-DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=ON \
-	-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="$(EXPERIMENTAL_TARGETS)" \
+	-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=$(EXPERIMENTAL_TARGETS) \
 	$(CMAKE_EXTRA) \
 	-DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
 	-DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
@@ -818,7 +818,7 @@ endif
 	-DBOOTSTRAP_LLVM_INSTALL_UTILS=ON \
 	-DBOOTSTRAP_LLVM_VERSION_SUFFIX= \
 	-DBOOTSTRAP_LLVM_POLLY_LINK_INTO_TOOLS=ON \
-	-DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD="$(EXPERIMENTAL_TARGETS)" \
+	-DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD=$(EXPERIMENTAL_TARGETS) \
 	-DBOOTSTRAP_LLVM_LINK_LLVM_DYLIB=ON \
 	-DBOOTSTRAP_LLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \
 	-DBOOTSTRAP_CLANG_LINK_CLANG_DYLIB=ON \

From 46fce2b8318ac4dfadc71a6a04c48853f6a020b8 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Sat, 4 May 2024 07:31:19 +0200
Subject: [PATCH 349/349] Add oracular as supported release

---
 debian/changelog                     |  6 +++
 debian/patches/ubuntu-releases.patch | 80 ++++++++++++++++++++++------
 2 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bcddf1f..c9cdde6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-17 (1:17.0.6-12) unstable; urgency=medium
+
+  * Add oracular as supported release
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 04 May 2024 07:30:47 +0200
+
 llvm-toolchain-17 (1:17.0.6-11) unstable; urgency=medium
 
   * Disable --as-needed on armel
diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch
index a2d7fbe2..60d21fe7 100644
--- a/debian/patches/ubuntu-releases.patch
+++ b/debian/patches/ubuntu-releases.patch
@@ -1,13 +1,19 @@
-Description: Update the list of Ubuntu release names
-Forwarded: no
-Author: Graham Inggs <ginggs@debian.org>
-Last-Update: 2023-04-29
+From 6266b964202336a02f40007928719e060bc81694 Mon Sep 17 00:00:00 2001
+From: Graham Inggs <ginggs@debian.org>
+Date: Wed, 1 Nov 2023 20:59:53 +0100
+Subject: [PATCH] Add support of the next Ubuntu (Ubuntu 24.04 - Noble Numbat)
 
-Index: llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h
-===================================================================
---- llvm-toolchain-17-17.0.3.orig/clang/include/clang/Driver/Distro.h
-+++ llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h
-@@ -78,6 +78,7 @@
+Co-authored-by: Sylvestre Ledru <sylvestre@debian.org>
+---
+ clang/include/clang/Driver/Distro.h | 3 ++-
+ clang/lib/Driver/Distro.cpp         | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
+index 8291f6575a7114..a8de94163e8b0b 100644
+--- a/clang/include/clang/Driver/Distro.h
++++ b/clang/include/clang/Driver/Distro.h
+@@ -78,6 +78,7 @@ class Distro {
      UbuntuKinetic,
      UbuntuLunar,
      UbuntuMantic,
@@ -15,7 +21,7 @@ Index: llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h
      UnknownDistro
    };
  
-@@ -129,7 +130,7 @@
+@@ -129,7 +130,7 @@ class Distro {
    }
  
    bool IsUbuntu() const {
@@ -24,11 +30,11 @@ Index: llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h
    }
  
    bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
-Index: llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp
-===================================================================
---- llvm-toolchain-17-17.0.3.orig/clang/lib/Driver/Distro.cpp
-+++ llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp
-@@ -94,6 +94,7 @@
+diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
+index 005c31bd38893c..36f828f8cae26d 100644
+--- a/clang/lib/Driver/Distro.cpp
++++ b/clang/lib/Driver/Distro.cpp
+@@ -94,6 +94,7 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) {
                      .Case("kinetic", Distro::UbuntuKinetic)
                      .Case("lunar", Distro::UbuntuLunar)
                      .Case("mantic", Distro::UbuntuMantic)
@@ -36,3 +42,47 @@ Index: llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp
                      .Default(Distro::UnknownDistro);
    return Version;
  }
+From 90bd7234e36e5b3d63155f481b739ea463985631 Mon Sep 17 00:00:00 2001
+From: Sylvestre Ledru <sylvestre@debian.org>
+Date: Thu, 2 May 2024 22:54:08 +0200
+Subject: [PATCH] Add support of the next Ubuntu (Ubuntu 24.10 - Oracular
+ Oriol)
+
+---
+ clang/include/clang/Driver/Distro.h | 3 ++-
+ clang/lib/Driver/Distro.cpp         | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
+index a8de94163e8b0b..1404e168684821 100644
+--- a/clang/include/clang/Driver/Distro.h
++++ b/clang/include/clang/Driver/Distro.h
+@@ -79,6 +79,7 @@ class Distro {
+     UbuntuLunar,
+     UbuntuMantic,
+     UbuntuNoble,
++    UbuntuOracular,
+     UnknownDistro
+   };
+ 
+@@ -130,7 +131,7 @@ class Distro {
+   }
+ 
+   bool IsUbuntu() const {
+-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble;
++    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuOracular;
+   }
+ 
+   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
+diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
+index a7e7f169dc1419..6f49e641104ccd 100644
+--- a/clang/lib/Driver/Distro.cpp
++++ b/clang/lib/Driver/Distro.cpp
+@@ -95,6 +95,7 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) {
+                     .Case("lunar", Distro::UbuntuLunar)
+                     .Case("mantic", Distro::UbuntuMantic)
+                     .Case("noble", Distro::UbuntuNoble)
++                    .Case("oracular", Distro::UbuntuOracular)
+                     .Default(Distro::UnknownDistro);
+   return Version;
+ }