diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch index 9e137ac9..b0f6e7d8 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_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py @@ -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_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/clang-tools-extra/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang-tools-extra/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py =================================================================== ---- 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" +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py +@@ -129,6 +129,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_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/clang/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/llvm/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/polly/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/polly/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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/D148945-revert.diff b/debian/patches/D148945-revert.diff index 4deb3b72..871be9a2 100644 --- a/debian/patches/D148945-revert.diff +++ b/debian/patches/D148945-revert.diff @@ -3,11 +3,11 @@ Restore that for now, we're not GenToo ... https://reviews.llvm.org/D148945 https://reviews.llvm.org/D122444 -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/Linux.cpp +@@ -345,6 +345,13 @@ Linux::Linux(const Driver &D, const llvm Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch index be9dac40..ec5a1211 100644 --- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch +++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch @@ -1,21 +1,7 @@ -Index: llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/lib/Target/ARM/ARM.td +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/include/llvm/TargetParser/ARMTargetParser.def =================================================================== ---- llvm-toolchain-snapshot_19~++20240303093231+800de14fab13.orig/llvm/lib/Target/ARM/ARM.td -+++ llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/lib/Target/ARM/ARM.td -@@ -914,7 +914,8 @@ def ARMv6sm : Architecture<"armv6s-m", - FeatureStrictAlign]>; - - def ARMv7a : Architecture<"armv7-a", "ARMv7a", [HasV7Ops, -- FeatureNEON, -+ FeatureVFP3, -+ FeatureVFP3_D16, - FeatureDB, - FeatureDSP, - FeatureAClass, -Index: llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/include/llvm/TargetParser/ARMTargetParser.def -=================================================================== ---- llvm-toolchain-snapshot_19~++20240303093231+800de14fab13.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def -+++ llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/include/llvm/TargetParser/ARMTargetParser.def +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/include/llvm/TargetParser/ARMTargetParser.def @@ -92,8 +92,8 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "+v6 FK_VFPV2, (ARM::AEK_SEC | ARM::AEK_DSP)) ARM_ARCH("armv6-m", ARMV6M, "6-M", "+v6m", ARMBuildAttrs::CPUArch::v6_M, @@ -27,3 +13,17 @@ Index: llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/include/llv ARM_ARCH("armv7ve", ARMV7VE, "7VE", "+v7ve", ARMBuildAttrs::CPUArch::v7, FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM | +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/lib/Target/ARM/ARMArchitectures.td +=================================================================== +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/lib/Target/ARM/ARMArchitectures.td ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/lib/Target/ARM/ARMArchitectures.td +@@ -42,7 +42,8 @@ def ARMv6sm : Architecture<"armv6s-m", + FeatureStrictAlign]>; + + def ARMv7a : Architecture<"armv7-a", "ARMv7a", [HasV7Ops, +- FeatureNEON, ++ FeatureVFP3, ++ FeatureVFP3_D16, + FeatureDB, + FeatureDSP, + FeatureAClass, 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 6d8840cc..bcb1c397 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_19~++20240220124703+f122268c0441/compiler-rt/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/CMakeLists.txt =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/CMakeLists.txt +@@ -285,6 +285,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY include(config-ix) diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index ce70bb99..0cf1fb0b 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_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- 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 () +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/builtins/CMakeLists.txt +@@ -773,6 +773,12 @@ else () append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() diff --git a/debian/patches/libclc-fix-prepare_builtins-rpath.diff b/debian/patches/libclc-fix-prepare_builtins-rpath.diff index 8ee965f8..e4cb134c 100644 --- a/debian/patches/libclc-fix-prepare_builtins-rpath.diff +++ b/debian/patches/libclc-fix-prepare_builtins-rpath.diff @@ -1,10 +1,10 @@ set rpath for prepare_builtins build utility to find correct stage2 libs at runtime when executed as part of a build -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libclc/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/libclc/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libclc/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libclc/CMakeLists.txt -@@ -121,6 +121,9 @@ add_llvm_executable( prepare_builtins ut +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/libclc/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/libclc/CMakeLists.txt +@@ -171,6 +171,9 @@ endif() target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) # These were not properly reported in early LLVM and we don't need them target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index a778f721..c9508ff9 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/CMakeLists.txt =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/CMakeLists.txt +@@ -903,8 +903,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/D154390-pre-R6.diff b/debian/patches/mips/D154390-pre-R6.diff index f311b6e9..e31d8078 100644 --- a/debian/patches/mips/D154390-pre-R6.diff +++ b/debian/patches/mips/D154390-pre-R6.diff @@ -1,10 +1,10 @@ see https://reviews.llvm.org/D158491, still unreviewed upstream -Index: llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/sanitizer_common/sanitizer_asm.h =================================================================== ---- llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -+++ llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -@@ -44,6 +44,8 @@ +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +@@ -54,6 +54,8 @@ #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__) # define ASM_TAIL_CALL jmp @@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc/compiler-rt/lib/ #elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ defined(__powerpc__) || defined(__loongarch_lp64) # define ASM_TAIL_CALL b -@@ -76,6 +78,25 @@ +@@ -86,6 +88,25 @@ SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " i_func #endif diff --git a/debian/patches/omp-riscv64.patch b/debian/patches/omp-riscv64.patch index 9a31b8b2..bbdf8668 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_19~++20240220124703+f122268c0441/openmp/runtime/src/kmp_affinity.h +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/openmp/runtime/src/kmp_affinity.h =================================================================== ---- 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: +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/openmp/runtime/src/kmp_affinity.h ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/openmp/runtime/src/kmp_affinity.h +@@ -221,6 +221,17 @@ public: #elif __NR_sched_getaffinity != 123 #error Wrong code for getaffinity system call. #endif /* __NR_sched_getaffinity */ diff --git a/debian/patches/revert-update-doc.diff b/debian/patches/revert-update-doc.diff index bd8e55b8..1f6e9b21 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_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py @@ -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_19~++20240220124703+f122268c0441/clang-tools-extr # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py =================================================================== ---- 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" +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py +@@ -57,6 +57,15 @@ master_doc = "index" project = "Clang" copyright = "2007-%d, The Clang Team" % date.today().year @@ -67,7 +67,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf. # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -@@ -79,11 +88,6 @@ exclude_patterns = ["_build"] +@@ -88,11 +97,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_19~++20240220124703+f122268c0441/clang/docs/conf. # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lld/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/lld/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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_19~++20240220124703+f122268c0441/lld/docs/conf.py # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/cmake/modules/AddSphinxTarget.cmake +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/cmake/modules/AddSphinxTarget.cmake ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/cmake/modules/AddSphinxTarget.cmake @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") endif() @@ -124,11 +124,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/cmake/modul ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested "${ARG_SOURCE_DIR}" # Source "${SPHINX_BUILD_DIR}" # Output -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/conf.py =================================================================== ---- 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" +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/conf.py +@@ -63,6 +63,15 @@ master_doc = "index" project = "LLVM" copyright = "2003-%d, LLVM Project" % date.today().year @@ -144,10 +144,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/conf.p # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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/unbreak-atomic-mips.diff b/debian/patches/unbreak-atomic-mips.diff index a998444d..f5d0cab3 100644 --- a/debian/patches/unbreak-atomic-mips.diff +++ b/debian/patches/unbreak-atomic-mips.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/scudo/standalone/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/scudo/standalone/CMakeLists.txt =================================================================== ---- 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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/scudo/standalone/CMakeLists.txt +@@ -195,6 +195,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH list(APPEND SCUDO_LINK_LIBS atomic) endif() diff --git a/debian/patches/wasm/wasm-compiler-rt-default.diff b/debian/patches/wasm/wasm-compiler-rt-default.diff index 70ce1aa6..18f5bdf9 100644 --- a/debian/patches/wasm/wasm-compiler-rt-default.diff +++ b/debian/patches/wasm/wasm-compiler-rt-default.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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 +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -421,6 +421,18 @@ ToolChain::RuntimeLibType WebAssembly::G return ToolChain::RLT_CompilerRT; } @@ -21,11 +21,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver ToolChain::CXXStdlibType WebAssembly::GetCXXStdlibType(const ArgList &Args) const { if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) { -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/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-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h +@@ -56,6 +56,7 @@ private: llvm::opt::ArgStringList &CC1Args, Action::OffloadKind DeviceOffloadKind) const override; RuntimeLibType GetDefaultRuntimeLibType() const override; diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff index b0f4ec28..d144faf5 100644 --- a/debian/patches/wasm/wasm-sysroot-usr.diff +++ b/debian/patches/wasm/wasm-sysroot-usr.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.cpp -@@ -200,7 +200,7 @@ WebAssembly::WebAssembly(const Driver &D +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -222,7 +222,7 @@ WebAssembly::WebAssembly(const Driver &D getProgramPaths().push_back(getDriver().Dir); @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver if (getTriple().getOS() == llvm::Triple::UnknownOS) { // Theoretically an "unknown" OS should mean no standard libraries, however // it could also mean that a custom set of libraries is in use, so just add -@@ -426,6 +426,7 @@ void WebAssembly::AddClangSystemIncludeA +@@ -454,6 +454,7 @@ void WebAssembly::AddClangSystemIncludeA return; const Driver &D = getDriver(); @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { SmallString<128> P(D.ResourceDir); -@@ -449,12 +450,20 @@ void WebAssembly::AddClangSystemIncludeA +@@ -477,12 +478,20 @@ void WebAssembly::AddClangSystemIncludeA return; } @@ -43,7 +43,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver } void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, -@@ -505,6 +514,17 @@ Tool *WebAssembly::buildLinker() const { +@@ -533,6 +542,17 @@ Tool *WebAssembly::buildLinker() const { return new tools::wasm::Linker(*this); } @@ -61,7 +61,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver void WebAssembly::addLibCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { -@@ -515,18 +535,22 @@ void WebAssembly::addLibCxxIncludePaths( +@@ -543,18 +563,22 @@ void WebAssembly::addLibCxxIncludePaths( getMultiarchTriple(D, getTriple(), SysRoot); bool IsKnownOs = (getTriple().getOS() != llvm::Triple::UnknownOS); @@ -91,7 +91,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver } void WebAssembly::addLibStdCXXIncludePaths( -@@ -573,8 +597,11 @@ void WebAssembly::addLibStdCXXIncludePat +@@ -601,8 +625,11 @@ void WebAssembly::addLibStdCXXIncludePat addSystemInclude(DriverArgs, CC1Args, TargetDir); } @@ -107,11 +107,11 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver + addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward"); + } } -Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.h -@@ -88,6 +88,8 @@ private: +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h +@@ -84,6 +84,8 @@ private: llvm::opt::ArgStringList &CC1Args) const; void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const;