proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-15 05:29:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase of the patches after the black changes

Browse Source
This commit is contained in:
Sylvestre Ledru 2023-05-23 09:40:23 +02:00
parent ec5a635685
commit aca1ec2f41
21 changed files with 457 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/patches/0044-soname.diff vendored
View File

@ -3,11 +3,11 @@
tools/llvm-shlib/CMakeLists.txt | 1 + tools/llvm-shlib/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-) 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_17~++20230523093327+96a003b9bf79.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/libclang/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt
@@ -117,7 +117,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE @@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
remove_definitions("-D_XOPEN_SOURCE=700") remove_definitions("-D_XOPEN_SOURCE=700")
endif() endif()
@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/libc
OUTPUT_NAME ${output_name} OUTPUT_NAME ${output_name}
${SOURCES} ${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_17~++20230523093327+96a003b9bf79.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/llvm/tools/llvm-shlib/CMakeLists.txt
@@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB) @@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
endif() endif()
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})

56
debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch vendored
View File

@ -13,24 +13,24 @@ Subject: Use Debian-provided MathJax everywhere.
polly/docs/doxygen.cfg.in | 2 +- polly/docs/doxygen.cfg.in | 2 +-
8 files changed, 14 insertions(+), 5 deletions(-) 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~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/conf.py
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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' @@ -119,6 +119,9 @@ html_theme = "haiku"
# so a file named "default.css" will overwrite the builtin "default.css". # so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static'] html_static_path = ["_static"]
+# Use Debian-provided MathJax +# Use Debian-provided MathJax
+mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' +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, # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format. # using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y' # html_last_updated_fmt = '%b %d, %Y'
Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/docs/doxygen.cfg.in 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~++20230523093327+96a003b9bf79.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/clang-tools-extra/docs/doxygen.cfg.in
@@ -1443,7 +1443,7 @@ MATHJAX_FORMAT = HTML-CSS @@ -1443,7 +1443,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest. # The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES. # 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 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example # 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~++20230523093327+96a003b9bf79.orig/clang/docs/analyzer/conf.py
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/analyzer/conf.py +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/analyzer/conf.py
@@ -120,6 +120,9 @@ html_theme = 'haiku' @@ -120,6 +120,9 @@ html_theme = "haiku"
# so a file named "default.css" will overwrite the builtin "default.css". # so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static'] 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, # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format. # using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y' # html_last_updated_fmt = '%b %d, %Y'
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~++20230523093327+96a003b9bf79.orig/clang/docs/conf.py
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py
@@ -134,6 +134,9 @@ html_theme = 'haiku' @@ -135,6 +135,9 @@ html_theme = "haiku"
# so a file named "default.css" will overwrite the builtin "default.css". # so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static'] 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, # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format. # using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y' # html_last_updated_fmt = '%b %d, %Y'
Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/doxygen.cfg.in 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~++20230523093327+96a003b9bf79.orig/clang/docs/doxygen.cfg.in
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/doxygen.cfg.in +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/doxygen.cfg.in
@@ -1432,7 +1432,7 @@ MATHJAX_FORMAT = HTML-CSS @@ -1432,7 +1432,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest. # The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES. # 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 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example # 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~++20230523093327+96a003b9bf79.orig/llvm/docs/doxygen.cfg.in
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/doxygen.cfg.in +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/doxygen.cfg.in
@@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest. # The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES. # 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 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example # 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~++20230523093327+96a003b9bf79.orig/polly/docs/doxygen.cfg.in
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/doxygen.cfg.in +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/doxygen.cfg.in
@@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest. # The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES. # This tag requires that the tag USE_MATHJAX is set to YES.

42
debian/patches/clang-format-version.diff vendored
View File

@ -4,23 +4,23 @@
clang/tools/clang-format/clang-format.py | 2 +- clang/tools/clang-format/clang-format.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-) 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~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format-diff.py
+++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format-diff.py +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format-diff.py
@@ -63,7 +63,7 @@ def main(): @@ -92,7 +92,7 @@ def main():
'fallback in case clang-format is invoked with' )
'-style=file, but can not find the .clang-format' parser.add_argument(
'file to use.') "-binary",
- parser.add_argument('-binary', default='clang-format', - default="clang-format",
+ parser.add_argument('-binary', default='clang-format-17', + default="clang-format-17",
help='location of binary to use for clang-format') help="location of binary to use for clang-format",
args = parser.parse_args() )
args = parser.parse_args()
Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.el 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~++20230523093327+96a003b9bf79.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/clang/tools/clang-format/clang-format.el
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
:group 'tools) :group 'tools)
@ -30,16 +30,16 @@ Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clan
"clang-format") "clang-format")
"Location of the clang-format executable. "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~++20230523093327+96a003b9bf79.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/clang/tools/clang-format/clang-format.py
@@ -49,7 +49,7 @@ import vim @@ -49,7 +49,7 @@ import vim
# set g:clang_format_path to the path to clang-format if it is not on the path # 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. # Change this to the full path if clang-format is not on the path.
-binary = 'clang-format' -binary = "clang-format"
+binary = 'clang-format-17' +binary = "clang-format-17"
if vim.eval('exists("g:clang_format_path")') == "1": if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path') binary = vim.eval("g:clang_format_path")

32
debian/patches/clang-tidy-run-bin.diff vendored
View File

@ -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~++20230523093327+96a003b9bf79.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 +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -225,8 +225,10 @@ def main(): @@ -256,10 +256,13 @@ def main():
action='store_true', help='allow alpha checkers from ' help="allow alpha checkers from " "clang-analyzer.",
'clang-analyzer.') )
parser.add_argument('-clang-tidy-binary', metavar='PATH', parser.add_argument(
+ default='clang-tidy-17', - "-clang-tidy-binary", metavar="PATH", help="path to clang-tidy binary"
help='path to clang-tidy binary') + "-clang-tidy-binary", metavar="PATH",
parser.add_argument('-clang-apply-replacements-binary', metavar='PATH', + default='clang-tidy-17',
+ default='clang-apply-replacements-17', + help="path to clang-tidy binary"
help='path to clang-apply-replacements binary') )
parser.add_argument('-checks', default=None, parser.add_argument(
help='checks filter, when not specified, use clang-tidy ' "-clang-apply-replacements-binary",
+ default='clang-apply-replacements-17',
metavar="PATH",
help="path to clang-apply-replacements binary",
)

8
debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff vendored
View File

@ -1,10 +1,10 @@
add option to disable compiler-rt scudo standalone allocator as it is 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 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~++20230523093327+96a003b9bf79.orig/compiler-rt/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/CMakeLists.txt
@@ -296,6 +296,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY @@ -303,6 +303,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY
include(config-ix) include(config-ix)

8
debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff vendored
View File

@ -1,10 +1,10 @@
fix builtins armhf default arch detection by adding the same armhf triple fix builtins armhf default arch detection by adding the same armhf triple
handling use for compiler-rt 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_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/builtins/CMakeLists.txt
+++ llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e/compiler-rt/lib/builtins/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt
@@ -29,6 +29,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR @@ -36,6 +36,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
load_llvm_config() load_llvm_config()
endif() endif()
construct_compiler_rt_default_triple() construct_compiler_rt_default_triple()

8
debian/patches/debug-jit-path.diff vendored
View File

@ -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_17~++20230523093327+96a003b9bf79.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
@@ -304,8 +304,8 @@ bool PerfJITEventListener::InitDebugging @@ -303,8 +303,8 @@ bool PerfJITEventListener::InitDebugging
// search for location to dump data to // search for location to dump data to
if (const char *BaseDir = getenv("JITDUMPDIR")) if (const char *BaseDir = getenv("JITDUMPDIR"))
Path.append(BaseDir); Path.append(BaseDir);

12
debian/patches/disable-path-test-failing.diff vendored
View File

@ -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_17~++20230523093327+96a003b9bf79.orig/llvm/unittests/Support/Path.cpp
+++ llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/Support/Path.cpp +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/Support/Path.cpp
@@ -677,7 +677,7 @@ protected: @@ -679,7 +679,7 @@ protected:
sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0"); sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
} }
@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/S
}; };
TEST_F(FileSystemTest, Unique) { 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. // This can fail if $HOME is not set and getpwuid fails.
bool Result = llvm::sys::path::home_directory(HomeDir); bool Result = llvm::sys::path::home_directory(HomeDir);
@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/S
checkSeparators(HomeDir); checkSeparators(HomeDir);
ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected)); ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected));
checkSeparators(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)); ASSERT_NO_ERROR(fs::real_path("~/", Actual, true));
EXPECT_EQ(Expected, Actual); EXPECT_EQ(Expected, Actual);
} }

8
debian/patches/force-sse2-compiler-rt.diff vendored
View File

@ -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~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/builtins/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/builtins/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt
@@ -758,6 +758,12 @@ else () @@ -765,6 +765,12 @@ else ()
append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
endif() endif()

8
debian/patches/libclc-fix-prepare_builtins-rpath.diff vendored
View File

@ -1,10 +1,10 @@
set rpath for prepare_builtins build utility to find correct stage2 set rpath for prepare_builtins build utility to find correct stage2
libs at runtime when executed as part of a build 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~++20230523093327+96a003b9bf79.orig/libclc/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libclc/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libclc/CMakeLists.txt
@@ -120,6 +120,9 @@ add_llvm_executable( prepare_builtins ut @@ -121,6 +121,9 @@ add_llvm_executable( prepare_builtins ut
target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} )
# These were not properly reported in early LLVM and we don't need them # These were not properly reported in early LLVM and we don't need them
target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions )

12
debian/patches/lldb/lldb-soname.diff vendored
View File

@ -2,11 +2,11 @@
lldb/source/API/CMakeLists.txt | 14 +++++++------- lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-) 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_17~++20230523093327+96a003b9bf79.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/CMakeLists.txt
@@ -15,7 +15,12 @@ if(LLDB_ENABLE_LUA) @@ -20,7 +20,12 @@ if(LLDB_ENABLE_LUA)
set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp) set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp)
endif() endif()
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/
SBAddress.cpp SBAddress.cpp
SBAttachInfo.cpp SBAttachInfo.cpp
SBBlock.cpp SBBlock.cpp
@@ -158,7 +163,7 @@ endif() @@ -164,7 +169,7 @@ endif()
set_target_properties(liblldb set_target_properties(liblldb
PROPERTIES PROPERTIES
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/
) )
target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) 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") set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc")
endif() endif()

8
debian/patches/llvm-fix-lld-linker-check.diff vendored
View File

@ -1,10 +1,10 @@
remove regex anchor in lld linker detection to account for vendor, if remove regex anchor in lld linker detection to account for vendor, if
specified, being prepended to lld version string 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_17~++20230523093327+96a003b9bf79.orig/llvm/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/AddLLVM.cmake +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddLLVM.cmake
@@ -217,7 +217,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED AND @@ -233,7 +233,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED AND
set(LLVM_LINKER_DETECTED YES CACHE INTERNAL "") set(LLVM_LINKER_DETECTED YES CACHE INTERNAL "")
set(LLVM_LINKER_IS_GOLD YES CACHE INTERNAL "") set(LLVM_LINKER_IS_GOLD YES CACHE INTERNAL "")
message(STATUS "Linker detection: GNU Gold") message(STATUS "Linker detection: GNU Gold")

8
debian/patches/lower-python-dep.diff vendored
View File

@ -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~++20230523093327+96a003b9bf79.orig/llvm/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/CMakeLists.txt
@@ -836,8 +836,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH @@ -843,8 +843,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH
"Profiling data file to use when compiling in order to improve runtime performance.") "Profiling data file to use when compiling in order to improve runtime performance.")
if(LLVM_INCLUDE_TESTS) if(LLVM_INCLUDE_TESTS)

54
debian/patches/openmp-fix-runtimes-build.diff vendored
View File

@ -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 they are built first when included as part of a runtimes build since openmp
can depend on them can depend on them
<<<<<<< Updated upstream <<<<<<< 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~++20230523093327+96a003b9bf79.orig/llvm/runtimes/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/runtimes/CMakeLists.txt
@@ -236,6 +236,7 @@ function(runtime_default_target) @@ -236,6 +236,7 @@ function(runtime_default_target)
-DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} -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 # 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 # built as part of runtimes and we need the profile runtime for PGO
add_dependencies(clang-bootstrap-deps runtimes) 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~++20230523093327+96a003b9bf79.orig/openmp/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/CMakeLists.txt
@@ -94,6 +94,28 @@ else() @@ -101,6 +101,28 @@ else()
set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
endif() 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 # Build host runtime library, after LIBOMPTARGET variables are set since they are needed
# to enable time profiling support in the OpenMP runtime. # to enable time profiling support in the OpenMP runtime.
add_subdirectory(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~++20230523093327+96a003b9bf79.orig/openmp/libomptarget/plugins/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
NO_INSTALL_RPATH NO_INSTALL_RPATH
) )
@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptar
# Install plugin under the lib destination folder. # Install plugin under the lib destination folder.
install(TARGETS "omptarget.rtl.${tmachine_libname}" install(TARGETS "omptarget.rtl.${tmachine_libname}"
LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") 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~++20230523093327+96a003b9bf79.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/openmp/libomptarget/plugins/cuda/CMakeLists.txt
@@ -55,6 +55,8 @@ endif() @@ -55,6 +55,8 @@ endif()
target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA") target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) 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 plugin under the lib destination folder.
install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
set_target_properties(omptarget.rtl.cuda PROPERTIES 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~++20230523093327+96a003b9bf79.orig/openmp/libomptarget/src/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptarget/src/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/libomptarget/src/CMakeLists.txt
@@ -36,7 +36,9 @@ add_llvm_library(omptarget @@ -36,7 +36,9 @@ add_llvm_library(omptarget
omp omp
@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/libomptar
target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) 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~++20230523093327+96a003b9bf79.orig/openmp/runtime/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt
@@ -292,6 +292,10 @@ if(LIBOMP_STATS) @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
set(LIBOMP_USE_STDCPPLIB TRUE) set(LIBOMP_USE_STDCPPLIB TRUE)
endif() endif()
@ -112,11 +112,11 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/C
# Shared library can be switched to a static library # Shared library can be switched to a static library
set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL
"Shared library instead of static library?") "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~++20230523093327+96a003b9bf79.orig/openmp/runtime/src/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/src/CMakeLists.txt
@@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM @@ -141,6 +141,7 @@ set_source_files_properties(${LIBOMP_GNU
if(NOT ${LIBOMP_USE_STDCPPLIB}) if(NOT ${LIBOMP_USE_STDCPPLIB})
set(LIBOMP_LINKER_LANGUAGE C) set(LIBOMP_LINKER_LANGUAGE C)
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
@ -124,7 +124,7 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/s
else() else()
set(LIBOMP_LINKER_LANGUAGE CXX) set(LIBOMP_LINKER_LANGUAGE CXX)
endif() endif()
@@ -200,6 +201,8 @@ else() @@ -202,6 +203,8 @@ else()
) )
endif() 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 # Get the library's location within the build tree for the unit tester
if(NOT WIN32) if(NOT WIN32)
get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY) 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~++20230523093327+96a003b9bf79.orig/openmp/tools/archer/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
target_link_libraries(archer ${CMAKE_DL_LIBS}) target_link_libraries(archer ${CMAKE_DL_LIBS})
add_library(archer_static STATIC ompt-tsan.cpp) add_library(archer_static STATIC ompt-tsan.cpp)

8
debian/patches/openmp-soname.diff vendored
View File

@ -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_17~++20230523093327+96a003b9bf79.orig/openmp/runtime/CMakeLists.txt
+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/openmp/runtime/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt
@@ -371,7 +371,8 @@ else() @@ -380,7 +380,8 @@ else()
set(LIBOMP_INSTALL_KIND ARCHIVE) set(LIBOMP_INSTALL_KIND ARCHIVE)
endif() endif()

18
debian/patches/python-clangpath.diff vendored
View File

@ -2,16 +2,16 @@
clang/bindings/python/clang/cindex.py | 2 +- clang/bindings/python/clang/cindex.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 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~++20230523093327+96a003b9bf79.orig/clang/bindings/python/clang/cindex.py
+++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/bindings/python/clang/cindex.py +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/clang/cindex.py
@@ -4172,7 +4172,7 @@ class Config(object): @@ -3937,7 +3937,7 @@ class Config(object):
elif name == 'Windows': elif name == "Windows":
file = 'libclang.dll' file = "libclang.dll"
else: else:
- file = 'libclang.so' - file = "libclang.so"
+ file = 'libclang-17.so' + file = "libclang-17.so"
if Config.library_path: if Config.library_path:
file = Config.library_path + '/' + file file = Config.library_path + "/" + file

492
debian/patches/python3-shebang.patch vendored
View File

File diff suppressed because it is too large Load Diff

60
debian/patches/revert-update-doc.diff vendored
View File

@ -15,13 +15,13 @@ Date: Tue Feb 1 23:13:01 2022 -0800
Differential Revision: https://reviews.llvm.org/D112181 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~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/conf.py
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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' @@ -44,6 +44,15 @@ master_doc = "index"
project = u'Extra Clang Tools' project = "Extra Clang Tools"
copyright = u'2007-%d, The Clang Team' % date.today().year copyright = "2007-%d, The Clang Team" % date.today().year
+# The version info for the project you're documenting, acts as replacement for +# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the +# |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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
#language = None # language = None
@@ -78,11 +87,6 @@ pygments_style = 'friendly' @@ -78,11 +87,6 @@ pygments_style = "friendly"
# A list of ignored prefixes for module index sorting. # 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 "" -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 --------------------------------------------------- # -- 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~++20230523093327+96a003b9bf79.orig/clang/docs/conf.py
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/conf.py +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py
@@ -62,6 +62,15 @@ master_doc = 'index' @@ -63,6 +63,15 @@ master_doc = "index"
project = u'Clang' project = "Clang"
copyright = u'2007-%d, The Clang Team' % date.today().year copyright = "2007-%d, The Clang Team" % date.today().year
+# The version info for the project you're documenting, acts as replacement for +# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the +# |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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
#language = None # language = None
@@ -93,11 +102,6 @@ exclude_patterns = ['_build'] @@ -94,11 +103,6 @@ exclude_patterns = ["_build"]
# The name of the Pygments (syntax highlighting) style to use. # 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 "" -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 --------------------------------------------------- # -- 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~++20230523093327+96a003b9bf79.orig/lld/docs/conf.py
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lld/docs/conf.py +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lld/docs/conf.py
@@ -43,6 +43,15 @@ master_doc = 'index' @@ -43,6 +43,15 @@ master_doc = 'index'
project = u'lld' project = u'lld'
copyright = u'2011-%d, LLVM Project' % date.today().year 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
#language = None #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~++20230523093327+96a003b9bf79.orig/llvm/cmake/modules/AddSphinxTarget.cmake
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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 @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj
set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
endif() 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 ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested
"${ARG_SOURCE_DIR}" # Source "${ARG_SOURCE_DIR}" # Source
"${SPHINX_BUILD_DIR}" # Output "${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~++20230523093327+96a003b9bf79.orig/llvm/docs/conf.py
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/docs/conf.py +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/conf.py
@@ -62,6 +62,15 @@ master_doc = "index" @@ -62,6 +62,15 @@ master_doc = "index"
project = "LLVM" project = "LLVM"
copyright = "2003-%d, LLVM Project" % date.today().year 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
# language = None # 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~++20230523093327+96a003b9bf79.orig/polly/docs/conf.py
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/polly/docs/conf.py +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/conf.py
@@ -44,6 +44,15 @@ master_doc = 'index' @@ -44,6 +44,15 @@ master_doc = 'index'
project = u'Polly' project = u'Polly'
copyright = u'2010-%d, The Polly Team' % date.today().year copyright = u'2010-%d, The Polly Team' % date.today().year

20
debian/patches/scan-build-py-fix-default-bin.diff vendored
View File

@ -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~++20230523093327+96a003b9bf79.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 +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
@@ -266,7 +266,7 @@ def create_analyze_parser(from_build_com @@ -293,7 +293,7 @@ def create_analyze_parser(from_build_com
'--use-analyzer', "--use-analyzer",
metavar='<path>', metavar="<path>",
dest='clang', dest="clang",
- default='clang', - default="clang",
+ default='clang-17', + default="clang-17",
help="""'%(prog)s' uses the 'clang' executable relative to itself for help="""'%(prog)s' uses the 'clang' executable relative to itself for
static analysis. One can override this behavior with this option by 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.""",

6
debian/patches/unwind-force-pthread-dl.diff vendored
View File

@ -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~++20230523093327+96a003b9bf79.orig/libunwind/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libunwind/CMakeLists.txt +++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libunwind/CMakeLists.txt
@@ -277,14 +277,17 @@ if (MSVC) @@ -277,14 +277,17 @@ if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif() endif()

22
debian/patches/wasm/wasm-sysroot-usr.diff vendored
View File

@ -1,5 +1,7 @@
--- a/clang/lib/Driver/ToolChains/WebAssembly.cpp Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.cpp
+++ b/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 @@ -174,7 +174,7 @@ WebAssembly::WebAssembly(const Driver &D
getProgramPaths().push_back(getDriver().getInstalledDir()); getProgramPaths().push_back(getDriver().getInstalledDir());
@ -17,7 +19,9 @@
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
SmallString<128> P(D.ResourceDir); 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 + // add the multiarch path on e.g. wasm32-wasi
if (getTriple().getOS() != llvm::Triple::UnknownOS) { if (getTriple().getOS() != llvm::Triple::UnknownOS) {
@ -39,7 +43,7 @@
} }
void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, 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); return new tools::wasm::Linker(*this);
} }
@ -57,7 +61,7 @@
void WebAssembly::addLibCxxIncludePaths( void WebAssembly::addLibCxxIncludePaths(
const llvm::opt::ArgList &DriverArgs, const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const { llvm::opt::ArgStringList &CC1Args) const {
@@ -499,7 +519,9 @@ void WebAssembly::addLibCxxIncludePaths( @@ -502,7 +522,9 @@ void WebAssembly::addLibCxxIncludePaths(
} }
// Second add the generic one. // Second add the generic one.
@ -68,7 +72,7 @@
} }
void WebAssembly::addLibStdCXXIncludePaths( void WebAssembly::addLibStdCXXIncludePaths(
@@ -546,8 +568,11 @@ void WebAssembly::addLibStdCXXIncludePat @@ -549,8 +571,11 @@ void WebAssembly::addLibStdCXXIncludePat
addSystemInclude(DriverArgs, CC1Args, TargetDir); addSystemInclude(DriverArgs, CC1Args, TargetDir);
} }
@ -84,8 +88,10 @@
+ addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward"); + addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
+ } + }
} }
--- a/clang/lib/Driver/ToolChains/WebAssembly.h Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/lib/Driver/ToolChains/WebAssembly.h
+++ b/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: @@ -89,6 +89,8 @@ private:
llvm::opt::ArgStringList &CC1Args) const; llvm::opt::ArgStringList &CC1Args) const;
void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs, void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs,