From 0f2646e14e9af7ed0449fdafdc422eb980f056aa Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Feb 2024 12:51:51 +0100 Subject: [PATCH] rebase of all patches --- debian/patches/0044-soname.diff | 21 +++-- ...-html_static_path-_static-everywhere.patch | 24 +++--- ...e-Debian-provided-MathJax-everywhere.patch | 44 +++++----- .../23-strlcpy_strlcat_warning_removed.diff | 44 +++++----- debian/patches/26-set-correct-float-abi.diff | 8 +- debian/patches/930008-arm.diff | 8 +- debian/patches/D148945-revert.diff | 8 +- debian/patches/arm32-defaults.diff | 8 +- .../clang-arm-default-vfp3-on-armv7a.patch | 14 +-- debian/patches/clang-format-version.diff | 22 ++--- ...pilerrt-build-scudo-standalone-option.diff | 8 +- .../compilerrt-builtins-arch-fix-armhf.diff | 8 +- debian/patches/declare_clear_cache.diff | 8 +- debian/patches/disable-path-test-failing.diff | 12 +-- debian/patches/disable-sse2-old-x86.diff | 8 +- debian/patches/fix-clang-path-and-build.diff | 10 +-- debian/patches/fix-scan-view-path.diff | 10 +-- debian/patches/force-sse2-compiler-rt.diff | 8 +- debian/patches/hurd/hurd-pathmax.diff | 14 +-- debian/patches/issue-54242.diff | 8 +- .../patches/libclang-major-version-only.diff | 8 +- .../libcxx-libatomic-only-with-gcc-rtlib.diff | 8 +- .../libcxx/libcxxabi-arm-ehabi-fix.patch | 20 ++--- .../libcxx/libcxxabi-fix-link-builtins.diff | 8 +- ...test-don-t-fail-extended-long-double.patch | 8 +- ...ddversion-suffix-to-llvm-server-exec.patch | 10 +-- debian/patches/lldb/lldb-soname.diff | 10 +-- debian/patches/lldb/print-lldb-path.patch | 14 +-- .../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/omp-riscv64.patch | 8 +- debian/patches/openmp-fix-runtimes-build.diff | 56 ++++++------ debian/patches/openmp-soname.diff | 8 +- debian/patches/python-clangpath.diff | 8 +- .../patches/remove-apple-clang-manpage.diff | 10 +-- debian/patches/revert-update-doc.diff | 42 ++++----- debian/patches/scan-build-clang-path.diff | 8 +- debian/patches/scan-view-fix-path.diff | 8 +- debian/patches/silent-gold-utils.diff | 86 +++++++++---------- debian/patches/symbolizer-path.diff | 18 ++-- debian/patches/unbreak-atomic-mips.diff | 8 +- debian/patches/unwind-chain-inclusion.diff | 8 +- debian/patches/unwind-force-pthread-dl.diff | 8 +- .../wasm/wasm-compiler-rt-default.diff | 16 ++-- debian/patches/wasm/wasm-ld-path.diff | 8 +- debian/patches/wasm/wasm-sysroot-usr.diff | 26 +++--- 48 files changed, 374 insertions(+), 365 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 4ef51f2b..42c0d66f 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_18~++20231209112655+5c8755f9f40e/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/clang/tools/libclang/CMakeLists.txt -@@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +@@ -135,7 +135,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,17 +16,16 @@ Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/llvm/tools/llvm-shlib/CMakeLists.txt -@@ -35,6 +35,8 @@ if(LLVM_BUILD_LLVM_DYLIB) - endif() - add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/tools/llvm-shlib/CMakeLists.txt +@@ -38,6 +38,8 @@ if(LLVM_BUILD_LLVM_DYLIB) + get_target_property(LLVM_DYLIB_FILENAME LLVM OUTPUT_NAME) + llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} ${LLVM_DYLIB_FILENAME} SHARED COMPONENT LLVM) + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + list(REMOVE_DUPLICATES LIB_NAMES) if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) - diff --git a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch index bf287bca..68e95358 100644 --- a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch +++ b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch @@ -9,11 +9,11 @@ Subject: Set html_static_path = ['_static'] everywhere. polly/docs/conf.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/analyzer/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/analyzer/conf.py -@@ -121,7 +121,7 @@ html_theme = 'haiku' +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py +@@ -118,7 +118,7 @@ html_theme = "haiku" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". @@ -22,11 +22,11 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/analyz # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/conf.py -@@ -122,7 +122,7 @@ html_theme = 'haiku' +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +@@ -118,7 +118,7 @@ html_theme = "haiku" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". @@ -35,11 +35,11 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/conf.p # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/polly/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/polly/docs/conf.py -@@ -127,7 +127,7 @@ except ImportError: +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py +@@ -124,7 +124,7 @@ except ImportError: # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch index 39c2ff05..9e137ac9 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_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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_17~++20230523093327+96a003b9bf79/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_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang-tools-extra/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/doxygen.cfg.in @@ -1443,7 +1443,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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~++20230523093327+96a003b9bf79/clang/docs/analyzer/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/analyzer/conf.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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_17~++20230523093327+96a003b9bf79/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~++20230523093327+96a003b9bf79/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 -@@ -135,6 +135,9 @@ html_theme = "haiku" +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/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'] @@ -68,10 +68,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/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~++20230523093327+96a003b9bf79/clang/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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~++20230523093327+96a003b9bf79/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~++20230523093327+96a003b9bf79/llvm/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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~++20230523093327+96a003b9bf79/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~++20230523093327+96a003b9bf79/polly/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 72909fc1..3199da50 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_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/Decl.cpp -@@ -4368,13 +4368,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/Decl.cpp +@@ -4381,13 +4381,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/SemaChecking.cpp +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/SemaChecking.cpp @@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: @@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -7699,10 +7699,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -7660,10 +7660,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -59,10 +59,10 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, @@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Static {{CDF_MaybeBuiltin, {{"snprintf"}}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, {{CDF_MaybeBuiltin, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -111,10 +111,10 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -171,11 +171,11 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/clang/Basic/Builtins.td +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/clang/Basic/Builtins.td =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/include/clang/Basic/Builtins.td -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/clang/Basic/Builtins.td -@@ -3199,7 +3199,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/clang/Basic/Builtins.td +@@ -3225,7 +3225,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h // non-standard but very common @@ -185,7 +185,7 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/cl let Spellings = ["strlcpy"]; let Prototype = "size_t(char*, char const*, size_t)"; } -@@ -3208,6 +3209,7 @@ def StrlCat : GNULibBuiltin<"string.h"> +@@ -3234,6 +3235,7 @@ def StrlCat : GNULibBuiltin<"string.h"> let Spellings = ["strlcat"]; let Prototype = "size_t(char*, char const*, size_t)"; } diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index 7321fd78..4d0bbb65 100644 --- a/debian/patches/26-set-correct-float-abi.diff +++ b/debian/patches/26-set-correct-float-abi.diff @@ -18,11 +18,11 @@ Forwarded: Reviewed-By: Last-Update: -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/ARM.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Arch/ARM.cpp =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Arch/ARM.cpp +@@ -421,7 +421,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 2374afcd..87479203 100644 --- a/debian/patches/930008-arm.diff +++ b/debian/patches/930008-arm.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/TargetParser/ARMTargetParser.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/ARMTargetParser.cpp =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -636,7 +636,7 @@ StringRef ARM::getARMCPUForArch(const ll case llvm::Triple::EABIHF: case llvm::Triple::GNUEABIHF: case llvm::Triple::MuslEABIHF: diff --git a/debian/patches/D148945-revert.diff b/debian/patches/D148945-revert.diff index 73426bdb..4deb3b72 100644 --- a/debian/patches/D148945-revert.diff +++ b/debian/patches/D148945-revert.diff @@ -3,9 +3,11 @@ 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 +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +@@ -337,6 +337,13 @@ Linux::Linux(const Driver &D, const llvm Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff index d3c6ece0..1cf277c4 100644 --- a/debian/patches/arm32-defaults.diff +++ b/debian/patches/arm32-defaults.diff @@ -1,6 +1,8 @@ ---- a/llvm/lib/TargetParser/ARMTargetParser.cpp -+++ b/llvm/lib/TargetParser/ARMTargetParser.cpp -@@ -637,9 +637,9 @@ StringRef ARM::getARMCPUForArch(const ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/ARMTargetParser.cpp +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -636,9 +636,9 @@ StringRef ARM::getARMCPUForArch(const ll case llvm::Triple::EABIHF: case llvm::Triple::GNUEABIHF: case llvm::Triple::MuslEABIHF: diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch index 21a0a955..f4318eb1 100644 --- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch +++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/Target/ARM/ARM.td +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Target/ARM/ARM.td =================================================================== ---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/lib/Target/ARM/ARM.td -+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/Target/ARM/ARM.td -@@ -905,7 +905,8 @@ def ARMv6sm : Architecture<"armv6s-m", +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/Target/ARM/ARM.td ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Target/ARM/ARM.td +@@ -914,7 +914,8 @@ def ARMv6sm : Architecture<"armv6s-m", FeatureStrictAlign]>; def ARMv7a : Architecture<"armv7-a", "ARMv7a", [HasV7Ops, @@ -12,10 +12,10 @@ Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/Target/ FeatureDB, FeatureDSP, FeatureAClass, -Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/ARMTargetParser.def +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/include/llvm/TargetParser/ARMTargetParser.def =================================================================== ---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def -+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/ARMTargetParser.def +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/include/llvm/TargetParser/ARMTargetParser.def @@ -68,7 +68,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "+v6 ARM_ARCH("armv6-m", ARMV6M, "6-M", "+v6m", ARMBuildAttrs::CPUArch::v6_M, FK_NONE, ARM::AEK_NONE) diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 29f8389e..22231969 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -4,11 +4,11 @@ clang/tools/clang-format/clang-format.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- 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(): +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/clang-format/clang-format-diff.py +@@ -93,7 +93,7 @@ def main(): ) parser.add_argument( "-binary", @@ -17,11 +17,11 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan 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 +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/clang-format/clang-format.el +@@ -38,7 +38,7 @@ :group 'tools) (defcustom clang-format-executable @@ -30,10 +30,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan "clang-format") "Location of the clang-format executable. -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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/compiler-rt/compilerrt-build-scudo-standalone-option.diff b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff index 4430c91c..6d8840cc 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~++20230523093327+96a003b9bf79/compiler-rt/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/CMakeLists.txt =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/CMakeLists.txt +@@ -282,6 +282,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 319053db..727f7d3f 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_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt +@@ -29,6 +29,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR load_llvm_config() endif() construct_compiler_rt_default_triple() diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff index 2869ad60..3b1462d1 100644 --- a/debian/patches/declare_clear_cache.diff +++ b/debian/patches/declare_clear_cache.diff @@ -2,11 +2,11 @@ lib/Support/Unix/Memory.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/llvm/lib/Support/Unix/Memory.inc +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Support/Unix/Memory.inc =================================================================== ---- llvm-toolchain-snapshot_16~++20221126040739+502c246519ec.orig/llvm/lib/Support/Unix/Memory.inc -+++ llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/llvm/lib/Support/Unix/Memory.inc -@@ -242,7 +242,7 @@ void Memory::InvalidateInstructionCache( +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/Support/Unix/Memory.inc ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Support/Unix/Memory.inc +@@ -243,7 +243,7 @@ void Memory::InvalidateInstructionCache( // FIXME: Can we safely always call this for __GNUC__ everywhere? const char *Start = static_cast(Addr); const char *End = Start + Len; diff --git a/debian/patches/disable-path-test-failing.diff b/debian/patches/disable-path-test-failing.diff index 62c6e0b8..79c707a0 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_17~++20230523093327+96a003b9bf79/llvm/unittests/Support/Path.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/unittests/Support/Path.cpp =================================================================== ---- 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: +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/unittests/Support/Path.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/unittests/Support/Path.cpp +@@ -680,7 +680,7 @@ protected: sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0"); } @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/S }; TEST_F(FileSystemTest, Unique) { -@@ -763,7 +763,8 @@ TEST_F(FileSystemTest, RealPath) { +@@ -768,7 +768,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_17~++20230523093327+96a003b9bf79/llvm/unittests/S checkSeparators(HomeDir); ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected)); checkSeparators(Expected); -@@ -772,6 +773,7 @@ TEST_F(FileSystemTest, RealPath) { +@@ -777,6 +778,7 @@ TEST_F(FileSystemTest, RealPath) { ASSERT_NO_ERROR(fs::real_path("~/", Actual, true)); EXPECT_EQ(Expected, Actual); } diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff index 4f5d242a..836ddd10 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_17~++20230705085103+4ef04876ef17/llvm/lib/TargetParser/X86TargetParser.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/X86TargetParser.cpp =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/TargetParser/X86TargetParser.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/X86TargetParser.cpp +@@ -59,7 +59,7 @@ constexpr FeatureBitset FeaturesPentium2 constexpr FeatureBitset FeaturesPentium3 = FeaturesPentium2 | FeatureSSE; // Pentium 4 CPUs diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff index 09394fb4..689f07db 100644 --- a/debian/patches/fix-clang-path-and-build.diff +++ b/debian/patches/fix-clang-path-and-build.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Driver/ToolChains/Linux.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Driver/ToolChains/Linux.cpp -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Driver/ToolChains/Linux.cpp -@@ -12,6 +12,7 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +@@ -13,6 +13,7 @@ #include "Arch/PPC.h" #include "Arch/RISCV.h" #include "CommonArgs.h" @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Driver #include "clang/Config/config.h" #include "clang/Driver/Distro.h" #include "clang/Driver/Driver.h" -@@ -579,8 +580,18 @@ void Linux::AddClangSystemIncludeArgs(co +@@ -627,8 +628,18 @@ void Linux::AddClangSystemIncludeArgs(co SmallString<128> ResourceDirInclude(D.ResourceDir); llvm::sys::path::append(ResourceDirInclude, "include"); if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff index e089b520..60c52bdd 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 = 8191 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-view/bin/scan-view +@@ -27,6 +27,7 @@ kDefaultPort = 8181 kMaxPortsToTry = 100 ### @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan- def url_is_up(url): -@@ -65,7 +66,7 @@ def start_browser(port, options): +@@ -64,7 +65,7 @@ def start_browser(port, options): def run(port, options, root): # Prefer to look relative to the installed binary diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index 13a5e3f4..ce70bb99 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_18~++20231114093943+6229cd0272a8/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231114093943+6229cd0272a8.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231114093943+6229cd0272a8/compiler-rt/lib/builtins/CMakeLists.txt -@@ -764,6 +764,12 @@ else () +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt +@@ -772,6 +772,12 @@ else () append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff index fcf3bde4..d0633ec9 100644 --- a/debian/patches/hurd/hurd-pathmax.diff +++ b/debian/patches/hurd/hurd-pathmax.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/clang/lib/Basic/FileManager.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/FileManager.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745.orig/clang/lib/Basic/FileManager.cpp -+++ llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/clang/lib/Basic/FileManager.cpp -@@ -611,6 +611,12 @@ FileManager::getNoncachedStatValue(Strin +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Basic/FileManager.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/FileManager.cpp +@@ -592,6 +592,12 @@ FileManager::getNoncachedStatValue(Strin return std::error_code(); } @@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/clang/lib/Basic/ void FileManager::GetUniqueIDMapping( SmallVectorImpl &UIDToFiles) const { UIDToFiles.clear(); -Index: llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/lldb/include/lldb/lldb-defines.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/include/lldb/lldb-defines.h =================================================================== ---- llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745.orig/lldb/include/lldb/lldb-defines.h -+++ llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/lldb/include/lldb/lldb-defines.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/include/lldb/lldb-defines.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/include/lldb/lldb-defines.h @@ -15,6 +15,11 @@ #define INT32_MAX 2147483647 #endif diff --git a/debian/patches/issue-54242.diff b/debian/patches/issue-54242.diff index e32cc735..73bc5b67 100644 --- a/debian/patches/issue-54242.diff +++ b/debian/patches/issue-54242.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/mlir/lib/ExecutionEngine/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/mlir/lib/ExecutionEngine/CMakeLists.txt =================================================================== ---- 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) +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/mlir/lib/ExecutionEngine/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/mlir/lib/ExecutionEngine/CMakeLists.txt +@@ -60,7 +60,7 @@ endif(LLVM_USE_PERF) add_mlir_library(MLIRExecutionEngine ExecutionEngine.cpp diff --git a/debian/patches/libclang-major-version-only.diff b/debian/patches/libclang-major-version-only.diff index 36800f38..aec0ff25 100644 --- a/debian/patches/libclang-major-version-only.diff +++ b/debian/patches/libclang-major-version-only.diff @@ -1,6 +1,8 @@ ---- a/clang/tools/libclang/CMakeLists.txt -+++ b/clang/tools/libclang/CMakeLists.txt -@@ -196,7 +196,7 @@ +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +@@ -208,7 +208,7 @@ if(ENABLE_SHARED) OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libclang.map) set_target_properties(libclang PROPERTIES 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 b750c4f0..5fde6eb6 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_18~++20231213094656+c02d07fdf007/libcxx/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxx/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007.orig/libcxx/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007/libcxx/CMakeLists.txt -@@ -685,13 +685,16 @@ function(cxx_link_system_libraries targe +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxx/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxx/CMakeLists.txt +@@ -691,13 +691,16 @@ function(cxx_link_system_libraries targe endif() elseif (LIBCXX_HAS_GCC_LIB) target_link_libraries(${target} PRIVATE gcc) diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch index fa5d859c..8c352ac6 100644 --- a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch +++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch @@ -7,11 +7,11 @@ sure their ABI stays in sync. No known upstream bug about this. -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxxabi/src/cxa_exception.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.cpp -@@ -275,15 +275,16 @@ __cxa_throw(void *thrown_object, std::ty +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/cxa_exception.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.cpp +@@ -286,15 +286,16 @@ __cxa_throw(void *thrown_object, std::ty #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); @@ -30,7 +30,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx // 2.5.3 Exception Handlers /* The adjusted pointer is computed by the personality routine during phase 1 -@@ -567,7 +568,11 @@ void __cxa_end_catch() { +@@ -578,7 +579,11 @@ void __cxa_end_catch() { // to touch a foreign exception in any way, that is undefined // behavior. They likely can't since the only way to catch // a foreign exception is with catch (...)! @@ -42,7 +42,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx globals->caughtExceptions = 0; } } -@@ -624,8 +629,10 @@ void __cxa_rethrow() { +@@ -635,8 +640,10 @@ void __cxa_rethrow() { } #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); @@ -54,7 +54,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx #endif // If we get here, some kind of unwinding error has occurred. -@@ -749,8 +756,10 @@ __cxa_rethrow_primary_exception(void* th +@@ -760,8 +767,10 @@ __cxa_rethrow_primary_exception(void* th dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup; #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader); @@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx #endif // Some sort of unwinding error. Note that terminate is a handler. __cxa_begin_catch(&dep_exception_header->unwindHeader); -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.h =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxxabi/src/cxa_exception.h -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/cxa_exception.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.h @@ -27,6 +27,45 @@ _LIBCXXABI_HIDDEN uint64_t __getExceptio _LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint64_t); _LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); diff --git a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff index 9c4f834d..9cf70c68 100644 --- a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff +++ b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff @@ -1,10 +1,10 @@ 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_17~++20230222041723+465ee9bfb26d/libcxxabi/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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() +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/CMakeLists.txt +@@ -75,7 +75,9 @@ if (NOT APPLE) # On Apple platforms, we add_library_flags_if(LIBCXXABI_HAS_C_LIB c) endif() 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 7712e3a8..40a395c8 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_17~++20230517015648+0b6264738f3d/libcxxabi/test/test_demangle.pass.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/test/test_demangle.pass.cpp =================================================================== ---- 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[] = +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/test/test_demangle.pass.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/test/test_demangle.pass.cpp +@@ -30238,7 +30238,7 @@ const char* invalid_cases[] = "NSoERj5E=Y1[uM:ga", "Aon_PmKVPDk7?fg4XP5smMUL6;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 cd822211..e8914201 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~++20230517015648+0b6264738f3d/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp =================================================================== ---- 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 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +@@ -32,6 +32,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~++20230517015648+0b6264738f3d/lldb/source/Plug #include "ProcessGDBRemoteLog.h" -@@ -41,7 +42,7 @@ +@@ -40,7 +41,7 @@ #elif defined(_WIN32) #define DEBUGSERVER_BASENAME "lldb-server.exe" #else diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff index 3989a52c..908a7e5f 100644 --- a/debian/patches/lldb/lldb-soname.diff +++ b/debian/patches/lldb/lldb-soname.diff @@ -2,10 +2,10 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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_17~++20230523093327+96a003b9bf79/lldb/source/API/ SBAddress.cpp SBAttachInfo.cpp SBBlock.cpp -@@ -164,7 +169,7 @@ endif() +@@ -169,7 +174,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/ ) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) -@@ -184,12 +189,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo +@@ -235,12 +240,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() diff --git a/debian/patches/lldb/print-lldb-path.patch b/debian/patches/lldb/print-lldb-path.patch index f325acd4..372d88fb 100644 --- a/debian/patches/lldb/print-lldb-path.patch +++ b/debian/patches/lldb/print-lldb-path.patch @@ -1,10 +1,10 @@ Author: Gianfranco Costamagna Last-Update: 2023-01-19 -Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/bindings/python/get-python-config.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/python/get-python-config.py =================================================================== ---- llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79.orig/lldb/bindings/python/get-python-config.py -+++ llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/bindings/python/get-python-config.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/bindings/python/get-python-config.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/python/get-python-config.py @@ -16,6 +16,7 @@ def relpath_nodots(path, base): @@ -34,11 +34,11 @@ Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/bindings/py except ValueError: # Try to fall back to something reasonable if sysconfig's platlib # is outside of sys.prefix -Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -+++ llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -@@ -240,6 +240,7 @@ void ScriptInterpreterPython::ComputePyt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +@@ -260,6 +260,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 eec769df..1e0c3bf7 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_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 -@@ -129,7 +129,12 @@ endfunction() +--- 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() # 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 1116fa9b..a778f721 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt +@@ -877,8 +877,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 ae99d678..15971c17 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_17~++20230517015648+0b6264738f3d/llvm/lib/MC/ELFObjectWriter.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/MC/ELFObjectWriter.cpp =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/MC/ELFObjectWriter.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/MC/ELFObjectWriter.cpp +@@ -1412,6 +1412,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 208b226e..b91ca1d5 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_17~++20230517015648+0b6264738f3d/clang/lib/Basic/Targets/Mips.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/Targets/Mips.h =================================================================== ---- 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: +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Basic/Targets/Mips.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/Targets/Mips.h +@@ -334,6 +334,8 @@ public: HasMSA = true; else if (Feature == "+nomadd4") DisableMadd4 = true; diff --git a/debian/patches/omp-riscv64.patch b/debian/patches/omp-riscv64.patch index 760aedfd..9a31b8b2 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_17~++20230517015648+0b6264738f3d/openmp/runtime/src/kmp_affinity.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/kmp_affinity.h =================================================================== ---- 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: +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/src/kmp_affinity.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/kmp_affinity.h +@@ -220,6 +220,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 1c44298e..8758042a 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_18~++20240109113757+a7262d2d9bee/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/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 @@ -247,6 +247,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} @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/llvm/runtimes/CM -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -513,7 +514,7 @@ if(runtimes) +@@ -517,7 +518,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. @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/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_18~++20240109113757+a7262d2d9bee/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/CMakeLists.txt -@@ -111,6 +111,28 @@ else() +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/CMakeLists.txt +@@ -113,6 +113,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,11 +56,11 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/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_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -@@ -71,6 +71,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +@@ -74,6 +74,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports") endif() @@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptar # Install plugin under the lib destination folder. install(TARGETS "omptarget.rtl.${tmachine_libname}" LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt @@ -80,6 +80,8 @@ else() " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() @@ -82,10 +82,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/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_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/libomptarget/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/libomptarget/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/src/CMakeLists.txt @@ -41,7 +41,9 @@ add_llvm_library(omptarget omp @@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptar target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt @@ -318,6 +318,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -112,10 +112,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/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_18~++20240109113757+a7262d2d9bee/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/CMakeLists.txt @@ -144,6 +144,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -124,7 +124,7 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/s else() set(LIBOMP_LINKER_LANGUAGE CXX) endif() -@@ -205,6 +206,8 @@ else() +@@ -209,6 +210,8 @@ else() ) endif() @@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/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_18~++20240109113757+a7262d2d9bee/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 f3188bce..5631696c 100644 --- a/debian/patches/openmp-soname.diff +++ b/debian/patches/openmp-soname.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 -@@ -380,7 +380,8 @@ else() +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt +@@ -411,7 +411,8 @@ else() set(LIBOMP_INSTALL_KIND ARCHIVE) endif() diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 9affdf2a..1c878a50 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_17~++20230523093327+96a003b9bf79/clang/bindings/python/clang/cindex.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/bindings/python/clang/cindex.py =================================================================== ---- 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): +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/bindings/python/clang/cindex.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/bindings/python/clang/cindex.py +@@ -3980,7 +3980,7 @@ class Config: elif name == "Windows": file = "libclang.dll" else: diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff index 6548700c..982fa7cf 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_17~++20230517015648+0b6264738f3d/clang/docs/CommandGuide/clang.rst +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/CommandGuide/clang.rst =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/CommandGuide/clang.rst ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/CommandGuide/clang.rst +@@ -354,24 +354,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_17~++20230517015648+0b6264738f3d/clang/docs/Comma .. option:: --print-supported-cpus Print out a list of supported processors for the given target (specified -@@ -705,11 +691,6 @@ ENVIRONMENT +@@ -721,11 +707,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 78cb249f..bd8e55b8 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~++20230526082102+a22ef958cb7e/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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,11 +47,11 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extr # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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" +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +@@ -48,6 +48,15 @@ master_doc = "index" project = "Clang" copyright = "2007-%d, The Clang Team" % date.today().year @@ -67,7 +67,7 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf. # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -@@ -94,11 +103,6 @@ exclude_patterns = ["_build"] +@@ -79,11 +88,6 @@ exclude_patterns = ["_build"] # The name of the Pygments (syntax highlighting) style to use. pygments_style = "friendly" @@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf. # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lld/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lld/docs/conf.py -+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lld/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lld/docs/conf.py @@ -43,6 +43,15 @@ master_doc = "index" project = "lld" copyright = "2011-%d, LLVM Project" % date.today().year @@ -99,10 +99,10 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/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~++20230526082102+a22ef958cb7e/llvm/cmake/modules/AddSphinxTarget.cmake +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/cmake/modules/AddSphinxTarget.cmake ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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,11 +124,11 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/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~++20230526082102+a22ef958cb7e/llvm/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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" +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/conf.py +@@ -52,6 +52,15 @@ master_doc = "index" project = "LLVM" copyright = "2003-%d, LLVM Project" % date.today().year @@ -144,10 +144,10 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/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~++20230526082102+a22ef958cb7e/polly/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/polly/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py @@ -44,6 +44,15 @@ master_doc = "index" project = "Polly" copyright = "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 b985062f..1d4012cc 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~++20230517015648+0b6264738f3d/clang/tools/scan-build/bin/scan-build +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-build/bin/scan-build =================================================================== ---- 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 { +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/scan-build/bin/scan-build ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-build/bin/scan-build +@@ -1494,7 +1494,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-view-fix-path.diff b/debian/patches/scan-view-fix-path.diff index 71284d03..420073b5 100644 --- a/debian/patches/scan-view-fix-path.diff +++ b/debian/patches/scan-view-fix-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/scan-view/bin/scan-view -@@ -65,7 +65,7 @@ def start_browser(port, options): +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-view/bin/scan-view +@@ -64,7 +64,7 @@ def start_browser(port, options): def run(port, options, root): # Prefer to look relative to the installed binary diff --git a/debian/patches/silent-gold-utils.diff b/debian/patches/silent-gold-utils.diff index 69bb1a4d..5344eb09 100644 --- a/debian/patches/silent-gold-utils.diff +++ b/debian/patches/silent-gold-utils.diff @@ -15,10 +15,10 @@ test/tools/gold/X86/visibility.ll | 1 + 14 files changed, 19 insertions(+), 2 deletions(-) -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/common_thinlto.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/common_thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/common_thinlto.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/common_thinlto.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/common_thinlto.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/common_thinlto.ll @@ -17,6 +17,7 @@ ; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM @@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ source_filename = "common1.c" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/emit-llvm.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/emit-llvm.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/emit-llvm.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/emit-llvm.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/emit-llvm.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/emit-llvm.ll @@ -21,6 +21,8 @@ ; RUN: not test -a %t4.o @@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/parallel.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/parallel.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/parallel.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/parallel.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/parallel.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/parallel.ll @@ -5,6 +5,7 @@ ; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s ; RUN: llvm-nm %t.lto.o | FileCheck --check-prefix=CHECK0 %s @@ -52,10 +52,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/pr19901_thinlto.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/pr19901_thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/pr19901_thinlto.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/pr19901_thinlto.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/pr19901_thinlto.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/pr19901_thinlto.ll @@ -4,6 +4,7 @@ ; RUN: --plugin-opt=thinlto \ ; RUN: -shared -m elf_x86_64 -o %t.so %t2.o %t.o @@ -64,10 +64,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ ; CHECK: Symbol { ; CHECK: Name: f -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/slp-vectorize.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/slp-vectorize.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/slp-vectorize.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/slp-vectorize.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/slp-vectorize.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/slp-vectorize.ll @@ -6,6 +6,7 @@ ; test that the vectorizer is run. @@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/strip_names.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/strip_names.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/strip_names.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/strip_names.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/strip_names.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/strip_names.ll @@ -25,6 +25,7 @@ ; NONAME: %2 = load i32, ptr @GlobalValueName ; NONAME: %3 = add i32 %0, %2 @@ -88,11 +88,11 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto.ll -@@ -148,6 +148,8 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto.ll +@@ -145,6 +145,8 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" @@ -101,10 +101,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ declare void @g(...) define void @f() { -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_archive.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_archive.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto_archive.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_archive.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto_archive.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_archive.ll @@ -15,6 +15,7 @@ ; RUN: --plugin-opt=jobs=1 \ ; RUN: -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s @@ -113,10 +113,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_internalize.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_internalize.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto_internalize.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_internalize.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto_internalize.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_internalize.ll @@ -14,6 +14,8 @@ ; h() should be internalized after promotion, and eliminated after inlining ; CHECK-NOT: @h.llvm. @@ -126,10 +126,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" define i32 @g() { -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll @@ -23,6 +23,8 @@ ; OPT-NOT: @f() ; OPT2: define weak_odr hidden void @f() @@ -139,10 +139,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" define i32 @g() { -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll @@ -9,6 +9,7 @@ ; RUN: --plugin-opt=save-temps \ ; RUN: -shared \ @@ -151,10 +151,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ ; RUN: llvm-nm %t3.o | FileCheck %s ; CHECK: weakfunc -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/type-merge2.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/type-merge2.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/type-merge2.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/type-merge2.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/type-merge2.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/type-merge2.ll @@ -6,6 +6,8 @@ ; RUN: -shared %t.o %t2.o -o %t3.o ; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s @@ -164,10 +164,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/vectorize.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/vectorize.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/vectorize.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/vectorize.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/vectorize.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/vectorize.ll @@ -6,6 +6,7 @@ ; test that the vectorizer is run. @@ -176,10 +176,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/visibility.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/visibility.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/visibility.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/visibility.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/visibility.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/visibility.ll @@ -16,6 +16,7 @@ ; CHECK-NEXT: Other [ ; CHECK-NEXT: STV_PROTECTED diff --git a/debian/patches/symbolizer-path.diff b/debian/patches/symbolizer-path.diff index d94593d3..4ed4338b 100644 --- a/debian/patches/symbolizer-path.diff +++ b/debian/patches/symbolizer-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp =================================================================== ---- 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 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +@@ -34,6 +34,11 @@ # include "sanitizer_symbolizer_libbacktrace.h" # include "sanitizer_symbolizer_mac.h" @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/ // 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 +@@ -450,7 +455,7 @@ static SymbolizerTool *ChooseExternalSym return new(*allocator) AtosSymbolizer(found_path, allocator); } #endif // SANITIZER_APPLE @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/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_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/CMakeLists.txt =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/CMakeLists.txt +@@ -214,6 +214,7 @@ set(SANITIZER_IMPL_HEADERS ) include_directories(..) diff --git a/debian/patches/unbreak-atomic-mips.diff b/debian/patches/unbreak-atomic-mips.diff index 9b251453..a998444d 100644 --- a/debian/patches/unbreak-atomic-mips.diff +++ b/debian/patches/unbreak-atomic-mips.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/scudo/standalone/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/scudo/standalone/CMakeLists.txt =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/scudo/standalone/CMakeLists.txt +@@ -194,6 +194,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH list(APPEND SCUDO_LINK_LIBS atomic) endif() diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff index 4918aaec..92c12a70 100644 --- a/debian/patches/unwind-chain-inclusion.diff +++ b/debian/patches/unwind-chain-inclusion.diff @@ -8,10 +8,10 @@ clang/lib/Headers/unwind.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/unwind.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Headers/unwind.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Headers/unwind.h -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/unwind.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Headers/unwind.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Headers/unwind.h @@ -9,9 +9,6 @@ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ @@ -32,7 +32,7 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Header #include #ifdef __cplusplus -@@ -323,6 +323,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc +@@ -327,6 +327,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc } #endif diff --git a/debian/patches/unwind-force-pthread-dl.diff b/debian/patches/unwind-force-pthread-dl.diff index 08111df4..89896032 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_17~++20230523093327+96a003b9bf79/libunwind/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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) +--- 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) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() diff --git a/debian/patches/wasm/wasm-compiler-rt-default.diff b/debian/patches/wasm/wasm-compiler-rt-default.diff index 351fcc79..70ce1aa6 100644 --- a/debian/patches/wasm/wasm-compiler-rt-default.diff +++ b/debian/patches/wasm/wasm-compiler-rt-default.diff @@ -1,6 +1,8 @@ ---- a/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp -@@ -369,6 +369,18 @@ ToolChain::RuntimeLibType WebAssembly::G +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -393,6 +393,18 @@ ToolChain::RuntimeLibType WebAssembly::G return ToolChain::RLT_CompilerRT; } @@ -19,9 +21,11 @@ ToolChain::CXXStdlibType WebAssembly::GetCXXStdlibType(const ArgList &Args) const { if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) { ---- a/clang/lib/Driver/ToolChains/WebAssembly.h -+++ b/clang/lib/Driver/ToolChains/WebAssembly.h -@@ -61,6 +61,7 @@ private: +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +@@ -60,6 +60,7 @@ private: llvm::opt::ArgStringList &CC1Args, Action::OffloadKind DeviceOffloadKind) const override; RuntimeLibType GetDefaultRuntimeLibType() const override; diff --git a/debian/patches/wasm/wasm-ld-path.diff b/debian/patches/wasm/wasm-ld-path.diff index 41789182..5617766b 100644 --- a/debian/patches/wasm/wasm-ld-path.diff +++ b/debian/patches/wasm/wasm-ld-path.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/lib/Driver/ToolChains/WebAssembly.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h @@ -10,9 +10,13 @@ #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_WEBASSEMBLY_H @@ -16,7 +16,7 @@ Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/lib/Driver namespace clang { namespace driver { namespace tools { -@@ -68,7 +72,7 @@ private: +@@ -67,7 +71,7 @@ private: llvm::opt::ArgStringList &CmdArgs) const override; SanitizerMask getSupportedSanitizers() const override; diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff index b3bbf565..592946a3 100644 --- a/debian/patches/wasm/wasm-sysroot-usr.diff +++ b/debian/patches/wasm/wasm-sysroot-usr.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -200,7 +200,7 @@ WebAssembly::WebAssembly(const Driver &D getProgramPaths().push_back(getDriver().getInstalledDir()); @@ -11,7 +11,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp 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 -@@ -402,6 +402,7 @@ void WebAssembly::AddClangSystemIncludeA +@@ -426,6 +426,7 @@ void WebAssembly::AddClangSystemIncludeA return; const Driver &D = getDriver(); @@ -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,20 @@ void WebAssembly::AddClangSystemIncludeA +@@ -449,12 +450,20 @@ void WebAssembly::AddClangSystemIncludeA return; } @@ -43,7 +43,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp } void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, -@@ -478,6 +487,17 @@ Tool *WebAssembly::buildLinker() const { +@@ -505,6 +514,17 @@ Tool *WebAssembly::buildLinker() const { return new tools::wasm::Linker(*this); } @@ -61,7 +61,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 { -@@ -488,18 +508,22 @@ void WebAssembly::addLibCxxIncludePaths( +@@ -515,18 +535,22 @@ void WebAssembly::addLibCxxIncludePaths( getMultiarchTriple(D, getTriple(), SysRoot); bool IsKnownOs = (getTriple().getOS() != llvm::Triple::UnknownOS); @@ -91,7 +91,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp } void WebAssembly::addLibStdCXXIncludePaths( -@@ -546,8 +570,11 @@ void WebAssembly::addLibStdCXXIncludePat +@@ -573,8 +597,11 @@ void WebAssembly::addLibStdCXXIncludePat addSystemInclude(DriverArgs, CC1Args, TargetDir); } @@ -107,11 +107,11 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp + addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward"); + } } -Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +@@ -88,6 +88,8 @@ private: llvm::opt::ArgStringList &CC1Args) const; void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const;