rebase of the patches

2025-08-08 18:30:34 +00:00 · 2024-07-11 13:35:21 +02:00 · 2024-07-11 13:35:21 +02:00 · abf0bb7e5e
commit abf0bb7e5e
parent e6f8456caa
15 changed files with 106 additions and 123 deletions
--- 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_19~++20240424094944+78ebaa2d798f/compiler-rt/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/compiler-rt/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/CMakeLists.txt
-@@ -285,6 +285,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/compiler-rt/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/compiler-rt/CMakeLists.txt
+@@ -286,6 +286,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY
 
 include(config-ix)
 
--- a/debian/patches/disable-openmp-per-target.diff
+++ b/debian/patches/disable-openmp-per-target.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_19~++20240229092005+22f5e30c1798/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240229092005+22f5e30c1798.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240229092005+22f5e30c1798/openmp/CMakeLists.txt
-@@ -48,13 +48,13 @@ else()
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt
+@@ -51,13 +51,13 @@ else()
   set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})
 
   # When building in tree we install the runtime according to the LLVM settings.
--- a/debian/patches/force-sse2-compiler-rt.diff
+++ b/debian/patches/force-sse2-compiler-rt.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/builtins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/compiler-rt/lib/builtins/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/builtins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -773,6 +773,12 @@ else ()
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/compiler-rt/lib/builtins/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/compiler-rt/lib/builtins/CMakeLists.txt
+@@ -796,6 +796,12 @@ else ()
     append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
   endif()
 
--- 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_19~++20240424094944+78ebaa2d798f/libclc/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libclc/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/libclc/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/libclc/CMakeLists.txt
-@@ -171,6 +171,9 @@ endif()
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/libclc/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libclc/CMakeLists.txt
+@@ -176,6 +176,9 @@ endif()
 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 )
--- a/debian/patches/link-with-package-metadata.diff
+++ b/debian/patches/link-with-package-metadata.diff
@ -1,6 +1,8 @@
--- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -283,6 +283,21 @@ Linux::Linux(const Driver &D, const llvm
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/Linux.cpp
+===================================================================
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -295,6 +295,21 @@ Linux::Linux(const Driver &D, const llvm
   ExtraOpts.push_back("--build-id");
 #endif
 
--- 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_19~++20240518075939+219476d20fcd/llvm/cmake/modules/AddLLVM.cmake
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/cmake/modules/AddLLVM.cmake
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/llvm/cmake/modules/AddLLVM.cmake
-+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/cmake/modules/AddLLVM.cmake
-@@ -233,7 +233,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED AND
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/cmake/modules/AddLLVM.cmake
+@@ -249,7 +249,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")
--- 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_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt
-@@ -135,7 +135,12 @@ endfunction()
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/runtimes/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt
+@@ -137,7 +137,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)
--- 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_19~++20240518075939+219476d20fcd/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/runtimes/CMakeLists.txt
-@@ -247,6 +247,7 @@ function(runtime_default_target)
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/runtimes/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt
+@@ -249,6 +249,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}
@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/runtimes/CM
                                       -DCMAKE_C_COMPILER_WORKS=ON
                                       -DCMAKE_CXX_COMPILER_WORKS=ON
                                       -DCMAKE_ASM_COMPILER_WORKS=ON
-@@ -557,7 +558,7 @@ if(runtimes)
+@@ -625,7 +626,7 @@ if(build_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_19~++20240518075939+219476d20fcd/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_19~++20240518075939+219476d20fcd/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/CMakeLists.txt
-@@ -119,6 +119,28 @@ else()
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt
+@@ -122,6 +122,28 @@ else()
   get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
 endif()
 
@ -55,20 +55,20 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/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_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/cuda/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/plugins-nextgen/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/cuda/CMakeLists.txt
-@@ -33,3 +33,5 @@ else()
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/plugins-nextgen/cuda/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/cuda/CMakeLists.txt
+@@ -26,3 +26,5 @@ else()
   message(STATUS "Not generating NVIDIA tests, no supported devices detected."
                    " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.")
 endif()
 +
 +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda)
-Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/src/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMakeLists.txt
@@ -38,6 +38,9 @@ add_llvm_library(omptarget
   NO_INSTALL_RPATH
   BUILDTREE_ONLY
@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMak
 target_include_directories(omptarget PRIVATE
   ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR}
 )
-Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/runtime/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/CMakeLists.txt
@@ -326,6 +326,10 @@ if(LIBOMP_STATS)
   set(LIBOMP_USE_STDCPPLIB TRUE)
 endif()
@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/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_19~++20240518075939+219476d20fcd/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/src/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/runtime/src/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/src/CMakeLists.txt
@@ -151,6 +151,7 @@ set_source_files_properties(${LIBOMP_ASM
 if(NOT ${LIBOMP_USE_STDCPPLIB})
   set(LIBOMP_LINKER_LANGUAGE C)
@ -106,7 +106,7 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/s
 else()
   set(LIBOMP_LINKER_LANGUAGE CXX)
 endif()
-@@ -216,6 +217,8 @@ else()
+@@ -220,6 +221,8 @@ else()
   )
 endif()
 
@ -115,10 +115,10 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/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_19~++20240518075939+219476d20fcd/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/tools/archer/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/tools/archer/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/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)
@ -129,11 +129,11 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/tools/arc
   install(TARGETS archer archer_static
     LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR})
-Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/host/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/host/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/plugins-nextgen/host/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/host/CMakeLists.txt
-@@ -31,6 +31,8 @@ else()
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/plugins-nextgen/host/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/host/CMakeLists.txt
+@@ -27,6 +27,8 @@ else()
   target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi)
 endif()
 
--- 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_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang-tools-extra/docs/conf.py
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang-tools-extra/docs/conf.py
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang-tools-extra/docs/conf.py
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/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_19~++20240424094944+78ebaa2d798f/clang-tools-extr
 
 # -- Options for HTML output ---------------------------------------------------
 
-Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/docs/conf.py
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/conf.py
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/docs/conf.py
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/docs/conf.py
@@ -57,6 +57,15 @@ master_doc = "index"
 project = "Clang"
 copyright = "2007-%d, The Clang Team" % date.today().year
@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.
 
 # -- Options for HTML output ---------------------------------------------------
 
-Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/lld/docs/conf.py
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/lld/docs/conf.py
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/lld/docs/conf.py
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/lld/docs/conf.py
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/lld/docs/conf.py
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/lld/docs/conf.py
@@ -43,6 +43,15 @@ master_doc = "index"
 project = "lld"
 copyright = "2011-%d, LLVM Project" % date.today().year
@ -99,11 +99,11 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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_19~++20240424094944+78ebaa2d798f/llvm/cmake/modules/AddSphinxTarget.cmake
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/cmake/modules/AddSphinxTarget.cmake
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/cmake/modules/AddSphinxTarget.cmake
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/cmake/modules/AddSphinxTarget.cmake
-@@ -39,10 +39,6 @@ function (add_sphinx_target builder proj
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/cmake/modules/AddSphinxTarget.cmake
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/cmake/modules/AddSphinxTarget.cmake
+@@ -40,10 +40,6 @@ function (add_sphinx_target builder proj
     set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
   endif()
 
@ -114,7 +114,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/cmake/modul
   add_custom_target(${SPHINX_TARGET_NAME}
                     COMMAND ${CMAKE_COMMAND} -E env ${ARG_ENV_VARS}
                             ${SPHINX_EXECUTABLE}
-@@ -50,9 +46,6 @@ function (add_sphinx_target builder proj
+@@ -51,9 +47,6 @@ function (add_sphinx_target builder proj
                             -d "${SPHINX_DOC_TREE_DIR}"
                             -q # Quiet: no output other than errors and warnings.
                             -t builder-${builder} # tag for builder
@ -124,10 +124,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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_19~++20240424094944+78ebaa2d798f/llvm/docs/conf.py
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/docs/conf.py
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/docs/conf.py
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/conf.py
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/docs/conf.py
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/docs/conf.py
@@ -63,6 +63,15 @@ master_doc = "index"
 project = "LLVM"
 copyright = "2003-%d, LLVM Project" % date.today().year
@ -144,10 +144,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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_19~++20240424094944+78ebaa2d798f/polly/docs/conf.py
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/polly/docs/conf.py
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/polly/docs/conf.py
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/polly/docs/conf.py
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/polly/docs/conf.py
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/polly/docs/conf.py
@@ -44,6 +44,15 @@ master_doc = "index"
 project = "Polly"
 copyright = "2010-%d, The Polly Team" % date.today().year
--- a/debian/patches/series
+++ b/debian/patches/series
@ -121,7 +121,6 @@ scan-build-py-fix-default-bin.diff

 omp-riscv64.patch
 lldb/test-disable-lldb-i386.diff
-unbreak-atomic-mips.diff
 llvm-fix-lld-linker-check.diff
 openmp-fix-runtimes-build.diff
 libclc-fix-prepare_builtins-rpath.diff
--- a/debian/patches/unbreak-atomic-mips.diff
+++ b/debian/patches/unbreak-atomic-mips.diff
@ -1,18 +0,0 @@
-Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/scudo/standalone/CMakeLists.txt
-===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/scudo/standalone/CMakeLists.txt
-@@ -195,6 +195,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH
-   list(APPEND SCUDO_LINK_LIBS atomic)
- endif()
- 
-+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR
-+   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64" OR
-+   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mipsel" OR
-+   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64el")
-+  list(APPEND SCUDO_LINK_LIBS atomic)
-+endif()
-+
- if(COMPILER_RT_HAS_SCUDO_STANDALONE)
-   add_compiler_rt_object_libraries(RTScudoStandalone
-     ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
--- a/debian/patches/unwind-force-pthread-dl.diff
+++ b/debian/patches/unwind-force-pthread-dl.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libunwind/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libunwind/CMakeLists.txt
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libunwind/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libunwind/CMakeLists.txt
-@@ -301,14 +301,17 @@ if (MSVC)
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/libunwind/CMakeLists.txt
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libunwind/CMakeLists.txt
+@@ -303,14 +303,17 @@ if (MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 
--- a/debian/patches/wasm/wasm-compiler-rt-default.diff
+++ b/debian/patches/wasm/wasm-compiler-rt-default.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp
-@@ -421,6 +421,18 @@ ToolChain::RuntimeLibType WebAssembly::G
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp
+@@ -457,6 +457,18 @@ ToolChain::RuntimeLibType WebAssembly::G
   return ToolChain::RLT_CompilerRT;
 }
 
@ -21,10 +21,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver
 ToolChain::CXXStdlibType
 WebAssembly::GetCXXStdlibType(const ArgList &Args) const {
   if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) {
-Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.h
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.h
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.h
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.h
@@ -56,6 +56,7 @@ private:
                         llvm::opt::ArgStringList &CC1Args,
                         Action::OffloadKind DeviceOffloadKind) const override;
--- a/debian/patches/wasm/wasm-ld-path.diff
+++ b/debian/patches/wasm/wasm-ld-path.diff
@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240319094628+703920d4138d.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
-+++ llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp
@@ -20,6 +20,11 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/VirtualFileSystem.h"
@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver
 using namespace clang::driver;
 using namespace clang::driver::tools;
 using namespace clang::driver::toolchains;
-@@ -241,7 +246,7 @@ WebAssembly::WebAssembly(const Driver &D
+@@ -243,7 +248,7 @@ WebAssembly::WebAssembly(const Driver &D
 const char *WebAssembly::getDefaultLinker() const {
   if (getOS() == "wasip2")
     return "wasm-component-ld";
--- a/debian/patches/wasm/wasm-sysroot-usr.diff
+++ b/debian/patches/wasm/wasm-sysroot-usr.diff
@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp
-@@ -222,7 +222,7 @@ WebAssembly::WebAssembly(const Driver &D
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp
+@@ -224,7 +224,7 @@ WebAssembly::WebAssembly(const Driver &D
 
   getProgramPaths().push_back(getDriver().Dir);
 
@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver
   if (getTriple().getOS() == llvm::Triple::UnknownOS) {
     // Theoretically an "unknown" OS should mean no standard libraries, however
     // it could also mean that a custom set of libraries is in use, so just add
-@@ -454,6 +454,7 @@ void WebAssembly::AddClangSystemIncludeA
+@@ -490,6 +490,7 @@ void WebAssembly::AddClangSystemIncludeA
     return;
 
   const Driver &D = getDriver();
@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver
 
   if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
     SmallString<128> P(D.ResourceDir);
-@@ -477,12 +478,20 @@ void WebAssembly::AddClangSystemIncludeA
+@@ -513,12 +514,20 @@ void WebAssembly::AddClangSystemIncludeA
     return;
   }
 
@ -43,7 +43,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver
 }
 
 void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
-@@ -533,6 +542,17 @@ Tool *WebAssembly::buildLinker() const {
+@@ -569,6 +578,17 @@ Tool *WebAssembly::buildLinker() const {
   return new tools::wasm::Linker(*this);
 }
 
@ -61,7 +61,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver
 void WebAssembly::addLibCxxIncludePaths(
     const llvm::opt::ArgList &DriverArgs,
     llvm::opt::ArgStringList &CC1Args) const {
-@@ -543,18 +563,22 @@ void WebAssembly::addLibCxxIncludePaths(
+@@ -579,18 +599,22 @@ void WebAssembly::addLibCxxIncludePaths(
       getMultiarchTriple(D, getTriple(), SysRoot);
   bool IsKnownOs = (getTriple().getOS() != llvm::Triple::UnknownOS);
 
@ -91,7 +91,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver
 }
 
 void WebAssembly::addLibStdCXXIncludePaths(
-@@ -601,8 +625,11 @@ void WebAssembly::addLibStdCXXIncludePat
+@@ -637,8 +661,11 @@ void WebAssembly::addLibStdCXXIncludePat
     addSystemInclude(DriverArgs, CC1Args, TargetDir);
   }
 
@ -107,10 +107,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver
 +    addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
 +  }
 }
-Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h
+Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.h
 ===================================================================
--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.h
-+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h
+--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.h
+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.h
@@ -84,6 +84,8 @@ private:
                              llvm::opt::ArgStringList &CC1Args) const;
   void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs,