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