From 225546cb923bbbcee4b878cf2789d4ad86ce1cb8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 17 May 2023 14:02:49 +0200 Subject: [PATCH] rebase of the patches --- ...e-Debian-provided-MathJax-everywhere.patch | 46 ++++++++-------- debian/patches/26-set-correct-float-abi.diff | 8 +-- debian/patches/930008-arm.diff | 8 +-- debian/patches/clang-baseline-fix-i386.patch | 8 +-- debian/patches/clangd-atomic-cmake.patch | 8 +-- ...pilerrt-build-scudo-standalone-option.diff | 8 +-- debian/patches/disable-sse2-old-x86.diff | 8 +-- .../do-not-fail-on-unexpected-pass.diff | 16 +++--- debian/patches/force-sse2-compiler-rt.diff | 8 +-- debian/patches/issue-54242.diff | 8 +-- .../libclc-fix-prepare_builtins-rpath.diff | 8 +-- .../libcxx-libatomic-only-with-gcc-rtlib.diff | 8 +-- ...bcxx-test-fix-lockfree-test-for-i386.patch | 8 +-- ...test-don-t-fail-extended-long-double.patch | 8 +-- ...ddversion-suffix-to-llvm-server-exec.patch | 10 ++-- debian/patches/lldb/lldb-missing-install.diff | 14 ++--- debian/patches/lldb/print-lldb-path.patch | 18 +++---- .../llvm-runtimes-builtins-build-check.diff | 8 +-- debian/patches/lower-python-dep.diff | 8 +-- debian/patches/mips/mips-D101773-reloc.patch | 8 +-- debian/patches/mips/mips-force-nomadd4.patch | 8 +-- debian/patches/mips/mips-fpxx-enable.diff | 10 ++-- debian/patches/omp-riscv64.patch | 8 +-- debian/patches/openmp-fix-runtimes-build.diff | 54 +++++++++---------- .../patches/remove-apple-clang-manpage.diff | 10 ++-- debian/patches/revert-update-doc.diff | 44 +++++++-------- debian/patches/scan-build-clang-path.diff | 8 +-- debian/patches/test-keep-alive.diff | 16 +++--- debian/patches/unbreak-atomic-mips.diff | 8 +-- debian/patches/unwind-force-pthread-dl.diff | 8 +-- 30 files changed, 199 insertions(+), 199 deletions(-) diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch index 624d7fb1..13fcd38f 100644 --- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch +++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch @@ -13,10 +13,10 @@ Subject: Use Debian-provided MathJax everywhere. polly/docs/doxygen.cfg.in | 2 +- 8 files changed, 14 insertions(+), 5 deletions(-) -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/conf.py +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py @@ -119,6 +119,9 @@ html_theme = 'haiku' # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extr # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. #html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang-tools-extra/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/doxygen.cfg.in @@ -1443,7 +1443,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -40,11 +40,11 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extr # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/analyzer/conf.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/analyzer/conf.py -@@ -123,6 +123,9 @@ html_theme = 'haiku' +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/analyzer/conf.py +@@ -120,6 +120,9 @@ html_theme = 'haiku' # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -54,11 +54,11 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/analy # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. #html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/conf.py -@@ -137,6 +137,9 @@ html_theme = 'haiku' +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py +@@ -134,6 +134,9 @@ html_theme = 'haiku' # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -68,10 +68,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/conf. # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. #html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/doxygen.cfg.in @@ -1432,7 +1432,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/doxyg # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/docs/doxyge # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/polly/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/polly/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index f7ea5633..7321fd78 100644 --- a/debian/patches/26-set-correct-float-abi.diff +++ b/debian/patches/26-set-correct-float-abi.diff @@ -18,11 +18,11 @@ Forwarded: Reviewed-By: Last-Update: -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/ARM.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/ARM.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/ARM.cpp -@@ -373,7 +373,7 @@ arm::FloatABI arm::getDefaultFloatABI(co +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/ARM.cpp +@@ -384,7 +384,7 @@ arm::FloatABI arm::getDefaultFloatABI(co case llvm::Triple::MuslEABI: case llvm::Triple::EABI: // EABI is always AAPCS, and if it was not marked 'hard', it's softfp diff --git a/debian/patches/930008-arm.diff b/debian/patches/930008-arm.diff index 41bd01b1..2374afcd 100644 --- a/debian/patches/930008-arm.diff +++ b/debian/patches/930008-arm.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/TargetParser/ARMTargetParser.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/TargetParser/ARMTargetParser.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/lib/TargetParser/ARMTargetParser.cpp -+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/TargetParser/ARMTargetParser.cpp -@@ -589,7 +589,7 @@ StringRef ARM::getARMCPUForArch(const ll +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -590,7 +590,7 @@ StringRef ARM::getARMCPUForArch(const ll case llvm::Triple::EABIHF: case llvm::Triple::GNUEABIHF: case llvm::Triple::MuslEABIHF: diff --git a/debian/patches/clang-baseline-fix-i386.patch b/debian/patches/clang-baseline-fix-i386.patch index 74961c10..592d2733 100644 --- a/debian/patches/clang-baseline-fix-i386.patch +++ b/debian/patches/clang-baseline-fix-i386.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/X86.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/X86.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/X86.cpp -@@ -114,8 +114,8 @@ std::string x86::getX86TargetCPU(const D +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/X86.cpp +@@ -111,8 +111,8 @@ std::string x86::getX86TargetCPU(const D case llvm::Triple::FreeBSD: return "i686"; default: diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch index dd7488cd..51860c8e 100644 --- a/debian/patches/clangd-atomic-cmake.patch +++ b/debian/patches/clangd-atomic-cmake.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extra/clangd/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9.orig/clang-tools-extra/clangd/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extra/clangd/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/clangd/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt @@ -61,6 +61,11 @@ endif() include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy") include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../include-cleaner/include") @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extr add_clang_library(clangDaemon AST.cpp ASTSignals.cpp -@@ -177,6 +182,7 @@ clang_target_link_libraries(clangDaemon +@@ -178,6 +183,7 @@ clang_target_link_libraries(clangDaemon target_link_libraries(clangDaemon PRIVATE ${LLVM_PTHREAD_LIB} diff --git a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff index e13a3bc8..e8f51b28 100644 --- a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff +++ b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff @@ -1,10 +1,10 @@ add option to disable compiler-rt scudo standalone allocator as it is not always supported by all arch profiles such as arm5vt of ARM32 arch -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/compiler-rt/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/compiler-rt/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/compiler-rt/CMakeLists.txt -@@ -271,6 +271,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/CMakeLists.txt +@@ -296,6 +296,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY include(config-ix) diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff index 10de84be..f70ac2b1 100644 --- a/debian/patches/disable-sse2-old-x86.diff +++ b/debian/patches/disable-sse2-old-x86.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/X86TargetParser.def +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/include/llvm/TargetParser/X86TargetParser.def =================================================================== ---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/include/llvm/TargetParser/X86TargetParser.def -+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/X86TargetParser.def -@@ -249,7 +249,7 @@ CPU_SPECIFIC("pentium_mmx", "pentium-mmx +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/include/llvm/TargetParser/X86TargetParser.def ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/include/llvm/TargetParser/X86TargetParser.def +@@ -251,7 +251,7 @@ CPU_SPECIFIC("pentium_mmx", "pentium-mmx CPU_SPECIFIC("pentium_ii", "pentium2", 'E', "+cmov,+mmx") CPU_SPECIFIC("pentium_iii", "pentium3", 'H', "+cmov,+mmx,+sse") CPU_SPECIFIC_ALIAS("pentium_iii_no_xmm_regs", "pentium3", "pentium_iii") diff --git a/debian/patches/do-not-fail-on-unexpected-pass.diff b/debian/patches/do-not-fail-on-unexpected-pass.diff index 25d064a5..2931c2ca 100644 --- a/debian/patches/do-not-fail-on-unexpected-pass.diff +++ b/debian/patches/do-not-fail-on-unexpected-pass.diff @@ -1,12 +1,12 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/Test.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/Test.py =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/utils/lit/lit/Test.py -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/Test.py -@@ -52,7 +52,7 @@ XFAIL = ResultCode('XFAIL', - UNRESOLVED = ResultCode('UNRESOLVED', 'Unresolved', True) - TIMEOUT = ResultCode('TIMEOUT', 'Timed Out', True) - FAIL = ResultCode('FAIL', 'Failed', True) --XPASS = ResultCode('XPASS', 'Unexpectedly Passed', True) +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/utils/lit/lit/Test.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/Test.py +@@ -52,7 +52,7 @@ XFAIL = ResultCode("XFAIL", "Expectedly + UNRESOLVED = ResultCode("UNRESOLVED", "Unresolved", True) + TIMEOUT = ResultCode("TIMEOUT", "Timed Out", True) + FAIL = ResultCode("FAIL", "Failed", True) +-XPASS = ResultCode("XPASS", "Unexpectedly Passed", True) +XPASS = ResultCode('XPASS', 'Unexpectedly Passed', False) diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index 0e0c617e..a1f0bb6a 100644 --- a/debian/patches/force-sse2-compiler-rt.diff +++ b/debian/patches/force-sse2-compiler-rt.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230308065614+73516b355c62/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230308065614+73516b355c62.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230308065614+73516b355c62/compiler-rt/lib/builtins/CMakeLists.txt -@@ -754,6 +754,12 @@ else () +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/builtins/CMakeLists.txt +@@ -758,6 +758,12 @@ else () append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() diff --git a/debian/patches/issue-54242.diff b/debian/patches/issue-54242.diff index 3f4fa75a..e32cc735 100644 --- a/debian/patches/issue-54242.diff +++ b/debian/patches/issue-54242.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/mlir/lib/ExecutionEngine/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/mlir/lib/ExecutionEngine/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/mlir/lib/ExecutionEngine/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/mlir/lib/ExecutionEngine/CMakeLists.txt -@@ -56,7 +56,7 @@ endif(LLVM_USE_PERF) +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/mlir/lib/ExecutionEngine/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/mlir/lib/ExecutionEngine/CMakeLists.txt +@@ -57,7 +57,7 @@ endif(LLVM_USE_PERF) add_mlir_library(MLIRExecutionEngine ExecutionEngine.cpp diff --git a/debian/patches/libclc-fix-prepare_builtins-rpath.diff b/debian/patches/libclc-fix-prepare_builtins-rpath.diff index 1e3e69b3..61d684be 100644 --- a/debian/patches/libclc-fix-prepare_builtins-rpath.diff +++ b/debian/patches/libclc-fix-prepare_builtins-rpath.diff @@ -1,10 +1,10 @@ set rpath for prepare_builtins build utility to find correct stage2 libs at runtime when executed as part of a build -Index: llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa/libclc/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libclc/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa.orig/libclc/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa/libclc/CMakeLists.txt -@@ -115,6 +115,9 @@ add_llvm_executable( prepare_builtins ut +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libclc/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libclc/CMakeLists.txt +@@ -120,6 +120,9 @@ add_llvm_executable( prepare_builtins ut target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) # These were not properly reported in early LLVM and we don't need them target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) diff --git a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff index 3a53afe6..8020fdef 100644 --- a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff +++ b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff @@ -1,9 +1,9 @@ if libatomic is found only link it if libgcc is the rtlib -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxx/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/CMakeLists.txt -@@ -777,12 +777,14 @@ function(cxx_link_system_libraries targe +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxx/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt +@@ -707,12 +707,14 @@ function(cxx_link_system_libraries targe endif() elseif (LIBCXX_HAS_GCC_LIB) target_link_libraries(${target} PRIVATE gcc) diff --git a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch index ba43d6ed..c7b97eeb 100644 --- a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch +++ b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch @@ -10,11 +10,11 @@ To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 defi Bug: https://llvm.org/bugs/show_bug.cgi?id=19355 -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -@@ -17,6 +17,14 @@ +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp +@@ -18,6 +18,14 @@ #include "test_macros.h" diff --git a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch index 929398ee..7712e3a8 100644 --- a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch +++ b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch @@ -2,11 +2,11 @@ Powerpc has extended double that doesn't match x86 coding. Power format would need special tests to verify correctness but for now it is enough to prevent incorrect test from running. -Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/test_demangle.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxxabi/test/test_demangle.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/test/test_demangle.pass.cpp -+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/test_demangle.pass.cpp -@@ -29902,7 +29902,7 @@ const char* invalid_cases[] = +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxxabi/test/test_demangle.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxxabi/test/test_demangle.pass.cpp +@@ -30163,7 +30163,7 @@ const char* invalid_cases[] = "NSoERj5E=Y1[uM:ga", "Aon_PmKVPDk7?fg4XP5smMUL6;Vl<>IL8ayHpiVDDDXTY;^o9;i", "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_", diff --git a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch index 7c58970c..cd822211 100644 --- a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch +++ b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch @@ -12,11 +12,11 @@ which could then break something else. This probably should have upstream bug but I couldn't find any existing report. -Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -+++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -@@ -34,6 +34,7 @@ +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +@@ -33,6 +33,7 @@ #include "lldb/Utility/StreamString.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/ScopedPrinter.h" @@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/lldb/source/Plug #include "ProcessGDBRemoteLog.h" -@@ -42,7 +43,7 @@ +@@ -41,7 +42,7 @@ #elif defined(_WIN32) #define DEBUGSERVER_BASENAME "lldb-server.exe" #else diff --git a/debian/patches/lldb/lldb-missing-install.diff b/debian/patches/lldb/lldb-missing-install.diff index 9bc83284..78f96947 100644 --- a/debian/patches/lldb/lldb-missing-install.diff +++ b/debian/patches/lldb/lldb-missing-install.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/argdumper/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/lldb/tools/argdumper/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/argdumper/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/argdumper/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt @@ -6,3 +6,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM ) @@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/argdu + +install(TARGETS lldb-argdumper + RUNTIME DESTINATION bin) -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/lldb-server/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/lldb/tools/lldb-server/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/lldb-server/CMakeLists.txt -@@ -66,3 +66,7 @@ add_dependencies(lldb-server +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/lldb-server/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt +@@ -68,3 +68,7 @@ add_dependencies(lldb-server ) target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source") target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS}) diff --git a/debian/patches/lldb/print-lldb-path.patch b/debian/patches/lldb/print-lldb-path.patch index 1b11531f..b9bb3b79 100644 --- a/debian/patches/lldb/print-lldb-path.patch +++ b/debian/patches/lldb/print-lldb-path.patch @@ -1,11 +1,11 @@ Author: Gianfranco Costamagna Last-Update: 2023-01-19 -Index: llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py =================================================================== ---- llvm-toolchain-15-15.0.6.orig/lldb/bindings/python/get-python-config.py -+++ llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py -@@ -15,6 +15,7 @@ +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/bindings/python/get-python-config.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py +@@ -15,6 +15,7 @@ def relpath_nodots(path, base): return rel def main(): @@ -13,7 +13,7 @@ Index: llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py parser = argparse.ArgumentParser(description="extract cmake variables from python") parser.add_argument("variable_name") args = parser.parse_args() -@@ -31,7 +32,19 @@ +@@ -31,7 +32,19 @@ def main(): # If not, you'll have to use lldb -P or lldb -print-script-interpreter-info # to figure out where it is. try: @@ -34,11 +34,11 @@ Index: llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py except ValueError: # Try to fall back to something reasonable if sysconfig's platlib # is outside of sys.prefix -Index: llvm-toolchain-15-15.0.6/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp =================================================================== ---- llvm-toolchain-15-15.0.6.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -+++ llvm-toolchain-15-15.0.6/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -@@ -238,6 +238,7 @@ +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +@@ -240,6 +240,7 @@ void ScriptInterpreterPython::ComputePyt // the real python interpreter uses. (e.g. lib for most, lib64 on RHEL // x86_64, or bin on Windows). llvm::sys::path::remove_filename(path); diff --git a/debian/patches/llvm-runtimes-builtins-build-check.diff b/debian/patches/llvm-runtimes-builtins-build-check.diff index b92225b3..eec769df 100644 --- a/debian/patches/llvm-runtimes-builtins-build-check.diff +++ b/debian/patches/llvm-runtimes-builtins-build-check.diff @@ -1,10 +1,10 @@ add a check and only set up and build compiler-rt builtins if they have not been disabled -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt -@@ -124,7 +124,12 @@ endfunction() +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt +@@ -129,7 +129,12 @@ endfunction() # is required because the other runtimes need the builtin libraries present # before the just-built compiler can pass the configuration tests. get_compiler_rt_path(compiler_rt_path) diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index e00aed77..4bc3c25c 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/CMakeLists.txt -@@ -811,8 +811,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/CMakeLists.txt +@@ -836,8 +836,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH "Profiling data file to use when compiling in order to improve runtime performance.") if(LLVM_INCLUDE_TESTS) diff --git a/debian/patches/mips/mips-D101773-reloc.patch b/debian/patches/mips/mips-D101773-reloc.patch index 09213f3c..ae99d678 100644 --- a/debian/patches/mips/mips-D101773-reloc.patch +++ b/debian/patches/mips/mips-D101773-reloc.patch @@ -24,11 +24,11 @@ Differential Revision: https://reviews.llvm.org/D101773 2 files changed, 33 insertions(+) create mode 100644 llvm/test/MC/Mips/mips_lo16.s -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/MC/ELFObjectWriter.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/MC/ELFObjectWriter.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/lib/MC/ELFObjectWriter.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/MC/ELFObjectWriter.cpp -@@ -1369,6 +1369,17 @@ bool ELFObjectWriter::shouldRelocateWith +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/MC/ELFObjectWriter.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/MC/ELFObjectWriter.cpp +@@ -1401,6 +1401,17 @@ bool ELFObjectWriter::shouldRelocateWith if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS && !hasRelocationAddend()) return true; diff --git a/debian/patches/mips/mips-force-nomadd4.patch b/debian/patches/mips/mips-force-nomadd4.patch index 95bf29b9..208b226e 100644 --- a/debian/patches/mips/mips-force-nomadd4.patch +++ b/debian/patches/mips/mips-force-nomadd4.patch @@ -6,11 +6,11 @@ support both, we have to disabled those instructions. For that, the patch below basically corresponds to the --with-madd4=no used on the GCC side. -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Basic/Targets/Mips.h +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Basic/Targets/Mips.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Basic/Targets/Mips.h -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Basic/Targets/Mips.h -@@ -332,6 +332,8 @@ public: +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Basic/Targets/Mips.h ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Basic/Targets/Mips.h +@@ -331,6 +331,8 @@ public: HasMSA = true; else if (Feature == "+nomadd4") DisableMadd4 = true; diff --git a/debian/patches/mips/mips-fpxx-enable.diff b/debian/patches/mips/mips-fpxx-enable.diff index d983d0c6..86c6b1d0 100644 --- a/debian/patches/mips/mips-fpxx-enable.diff +++ b/debian/patches/mips/mips-fpxx-enable.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/Mips/MipsSubtarget.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/Target/Mips/MipsSubtarget.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp -+++ llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/Mips/MipsSubtarget.cpp +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/Target/Mips/MipsSubtarget.cpp @@ -81,7 +81,7 @@ MipsSubtarget::MipsSubtarget(const Tripl InMips16HardFloat(Mips16HardFloat), InMicroMipsMode(false), HasDSP(false), HasDSPR2(false), HasDSPR3(false), AllowMixed16_32(Mixed16_32 || Mips_Os16), @@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/ // MIPS-I has not been tested. if (MipsArchVersion == Mips1 && !MIPS1WarningPrinted) { errs() << "warning: MIPS-I support is experimental\n"; -@@ -243,6 +246,7 @@ MipsSubtarget & +@@ -242,6 +245,7 @@ MipsSubtarget & MipsSubtarget::initializeSubtargetDependencies(StringRef CPU, StringRef FS, const TargetMachine &TM) { StringRef CPUName = MIPS_MC::selectMipsCPU(TM.getTargetTriple(), CPU); @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/ // Parse features string. ParseSubtargetFeatures(CPUName, /*TuneCPU*/ CPUName, FS); -@@ -265,6 +269,13 @@ MipsSubtarget::initializeSubtargetDepend +@@ -264,6 +268,13 @@ MipsSubtarget::initializeSubtargetDepend report_fatal_error("64-bit code requested on a subtarget that doesn't " "support it!"); diff --git a/debian/patches/omp-riscv64.patch b/debian/patches/omp-riscv64.patch index bd781bb0..760aedfd 100644 --- a/debian/patches/omp-riscv64.patch +++ b/debian/patches/omp-riscv64.patch @@ -1,11 +1,11 @@ Description: Define the affinity for riscv64 Last-Update: 2021-08-27 -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/openmp/runtime/src/kmp_affinity.h +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/kmp_affinity.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/openmp/runtime/src/kmp_affinity.h -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/openmp/runtime/src/kmp_affinity.h -@@ -210,6 +210,17 @@ public: +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/src/kmp_affinity.h ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/kmp_affinity.h +@@ -212,6 +212,17 @@ public: #elif __NR_sched_getaffinity != 123 #error Wrong code for getaffinity system call. #endif /* __NR_sched_getaffinity */ diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index d5e5b2d4..13b4ba43 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -2,10 +2,10 @@ include required runtimes as dependencies to openmp targets to make sure they are built first when included as part of a runtimes build since openmp can depend on them <<<<<<< Updated upstream -Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt @@ -236,6 +236,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/llvm/runtimes/CM # We need to add the runtimes as a dependency because compiler-rt can be # built as part of runtimes and we need the profile runtime for PGO add_dependencies(clang-bootstrap-deps runtimes) -Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/CMakeLists.txt -@@ -91,6 +91,28 @@ else() +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/CMakeLists.txt +@@ -94,6 +94,28 @@ else() set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") endif() @@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/CMakeList # Build host runtime library, after LIBOMPTARGET variables are set since they are needed # to enable time profiling support in the OpenMP runtime. add_subdirectory(runtime) -Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/libomptarget/plugins/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/libomptarget/plugins/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/CMakeLists.txt @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma NO_INSTALL_RPATH ) @@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptar # Install plugin under the lib destination folder. install(TARGETS "omptarget.rtl.${tmachine_libname}" LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") -Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/plugins/cuda/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/plugins/cuda/CMakeLists.txt @@ -55,6 +55,8 @@ endif() target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA") target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) @@ -82,10 +82,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptar # Install plugin under the lib destination folder. install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") set_target_properties(omptarget.rtl.cuda PROPERTIES -Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/libomptarget/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptarget/src/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/libomptarget/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/src/CMakeLists.txt @@ -36,7 +36,9 @@ add_llvm_library(omptarget omp @@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/libomptar target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/CMakeLists.txt @@ -292,6 +292,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -112,11 +112,11 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/C # Shared library can be switched to a static library set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL "Shared library instead of static library?") -Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/src/CMakeLists.txt -@@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/CMakeLists.txt +@@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) @@ -124,7 +124,7 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/s else() set(LIBOMP_LINKER_LANGUAGE CXX) endif() -@@ -201,6 +202,8 @@ else() +@@ -200,6 +201,8 @@ else() ) endif() @@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/runtime/s # Get the library's location within the build tree for the unit tester if(NOT WIN32) get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY) -Index: llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230507104621+728b8a139804.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230507104621+728b8a139804/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/tools/archer/CMakeLists.txt @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER target_link_libraries(archer ${CMAKE_DL_LIBS}) add_library(archer_static STATIC ompt-tsan.cpp) diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff index 47e7bd78..6548700c 100644 --- a/debian/patches/remove-apple-clang-manpage.diff +++ b/debian/patches/remove-apple-clang-manpage.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/CommandGuide/clang.rst +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/CommandGuide/clang.rst =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/CommandGuide/clang.rst -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/CommandGuide/clang.rst -@@ -345,24 +345,10 @@ Clang fully supports cross compilation a +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/CommandGuide/clang.rst ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/CommandGuide/clang.rst +@@ -353,24 +353,10 @@ Clang fully supports cross compilation a Depending on how your version of Clang is configured, it may have support for a number of cross compilers, or may only support a native target. @@ -27,7 +27,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/Comma .. option:: --print-supported-cpus Print out a list of supported processors for the given target (specified -@@ -681,11 +667,6 @@ ENVIRONMENT +@@ -705,11 +691,6 @@ ENVIRONMENT These environment variables specify additional paths, as for :envvar:`CPATH`, which are only used when processing the appropriate language. diff --git a/debian/patches/revert-update-doc.diff b/debian/patches/revert-update-doc.diff index aeea4c23..6a29aa65 100644 --- a/debian/patches/revert-update-doc.diff +++ b/debian/patches/revert-update-doc.diff @@ -15,10 +15,10 @@ Date: Tue Feb 1 23:13:01 2022 -0800 Differential Revision: https://reviews.llvm.org/D112181 -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extra/docs/conf.py +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/conf.py @@ -44,6 +44,15 @@ master_doc = 'index' project = u'Extra Clang Tools' copyright = u'2007-%d, The Clang Team' % date.today().year @@ -47,10 +47,10 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extr # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf.py +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py @@ -62,6 +62,15 @@ master_doc = 'index' project = u'Clang' copyright = u'2007-%d, The Clang Team' % date.today().year @@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf. # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lld/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/lld/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lld/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lld/docs/conf.py @@ -43,6 +43,15 @@ master_doc = 'index' project = u'lld' copyright = u'2011-%d, LLVM Project' % date.today().year @@ -99,10 +99,10 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. #language = None -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modules/AddSphinxTarget.cmake +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/cmake/modules/AddSphinxTarget.cmake =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/llvm/cmake/modules/AddSphinxTarget.cmake -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modules/AddSphinxTarget.cmake +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/cmake/modules/AddSphinxTarget.cmake ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/cmake/modules/AddSphinxTarget.cmake @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") endif() @@ -124,13 +124,13 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modul ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested "${ARG_SOURCE_DIR}" # Source "${SPHINX_BUILD_DIR}" # Output -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/llvm/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.py -@@ -61,6 +61,15 @@ master_doc = 'index' - project = u'LLVM' - copyright = u'2003-%d, LLVM Project' % date.today().year +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/conf.py +@@ -62,6 +62,15 @@ master_doc = "index" + project = "LLVM" + copyright = "2003-%d, LLVM Project" % date.today().year +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the @@ -143,11 +143,11 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.p + # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. - #language = None -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/polly/docs/conf.py + # language = None +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/polly/docs/conf.py +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/conf.py @@ -44,6 +44,15 @@ master_doc = 'index' project = u'Polly' copyright = u'2010-%d, The Polly Team' % date.today().year diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 1a3c5a37..cbc11e45 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -2,11 +2,11 @@ clang/tools/scan-build/bin/scan-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/bin/scan-build +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan-build/bin/scan-build =================================================================== ---- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/tools/scan-build/bin/scan-build -+++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/bin/scan-build -@@ -1786,7 +1786,7 @@ sub FindClang { +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/tools/scan-build/bin/scan-build ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan-build/bin/scan-build +@@ -1485,7 +1485,7 @@ sub FindClang { if (!defined $Options{AnalyzerDiscoveryMethod}) { $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); if (!defined $Clang || ! -x $Clang) { diff --git a/debian/patches/test-keep-alive.diff b/debian/patches/test-keep-alive.diff index a1074816..ff20daa4 100644 --- a/debian/patches/test-keep-alive.diff +++ b/debian/patches/test-keep-alive.diff @@ -1,20 +1,20 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/ProgressBar.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/ProgressBar.py =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/utils/lit/lit/ProgressBar.py -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/ProgressBar.py -@@ -189,15 +189,7 @@ class SimpleProgressBar: +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/utils/lit/lit/ProgressBar.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/ProgressBar.py +@@ -203,15 +203,7 @@ class SimpleProgressBar: return for i in range(self.atIndex, next): - idx = i % 5 - if idx == 0: -- sys.stdout.write('%2d' % (i*2)) +- sys.stdout.write("%2d" % (i * 2)) - elif idx == 1: -- pass # Skip second char +- pass # Skip second char - elif idx < 4: -- sys.stdout.write('.') +- sys.stdout.write(".") - else: -- sys.stdout.write(' ') +- sys.stdout.write(" ") + sys.stdout.write('%-2d ' % (i*2)) sys.stdout.flush() self.atIndex = next diff --git a/debian/patches/unbreak-atomic-mips.diff b/debian/patches/unbreak-atomic-mips.diff index ddfb25fc..9b251453 100644 --- a/debian/patches/unbreak-atomic-mips.diff +++ b/debian/patches/unbreak-atomic-mips.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/scudo/standalone/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/scudo/standalone/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/scudo/standalone/CMakeLists.txt -@@ -145,6 +145,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/scudo/standalone/CMakeLists.txt +@@ -178,6 +178,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH list(APPEND SCUDO_LINK_LIBS atomic) endif() diff --git a/debian/patches/unwind-force-pthread-dl.diff b/debian/patches/unwind-force-pthread-dl.diff index d389bca4..5002aa2f 100644 --- a/debian/patches/unwind-force-pthread-dl.diff +++ b/debian/patches/unwind-force-pthread-dl.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/libunwind/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libunwind/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/libunwind/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/libunwind/CMakeLists.txt -@@ -308,14 +308,17 @@ if (MSVC) +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libunwind/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libunwind/CMakeLists.txt +@@ -277,14 +277,17 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif()