From 5b90795822c4aea7a3ff04116a677024dbe07ab3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 13:56:36 +0100 Subject: [PATCH 001/241] prepare 19 --- debian/control | 220 +++++++++--------- .../patches/clang-analyzer-force-version.diff | 4 +- debian/patches/clang-format-version.diff | 6 +- debian/patches/clang-tidy-run-bin.diff | 10 +- debian/patches/fix-scan-view-path.diff | 4 +- debian/patches/python-clangpath.diff | 2 +- debian/patches/scan-build-clang-path.diff | 2 +- .../scan-build-py-fix-default-bin.diff | 2 +- debian/prepare-new-release.sh | 12 +- debian/unpack.sh | 2 +- 10 files changed, 132 insertions(+), 132 deletions(-) diff --git a/debian/control b/debian/control index 1f404ba6..ce9b3fdb 100644 --- a/debian/control +++ b/debian/control @@ -40,18 +40,18 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot # ------------- clang ------------- -Package: clang-18 +Package: clang-19 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, - libllvm18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}), - llvm-18-linker-tools (= ${binary:Version}), - libclang1-18 (= ${binary:Version}), libc6-dev, binutils + libllvm19 (= ${binary:Version}), + libclang-common-19-dev (= ${source:Version}), + llvm-19-linker-tools (= ${binary:Version}), + libclang1-19 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-18-dev, python3 -# libomp-18-dev -Suggests: clang-18-doc, wasi-libc +Recommends: llvm-19-dev, python3 +# libomp-19-dev +Suggests: clang-19-doc, wasi-libc Description: C, C++ and Objective-C compiler Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -60,9 +60,9 @@ Description: C, C++ and Objective-C compiler Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also provides most of the support of C++20. -Package: clang-tools-18 +Package: clang-tools-19 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-18 (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-19 (= ${binary:Version}), python3 Description: clang-based tools for C/C++ developments Clang project is a C, C++, Objective C and Objective C++ front-end @@ -74,10 +74,10 @@ Description: clang-based tools for C/C++ developments . This package contains some clang-based tools like scan-build, clang-cl, etc. -Package: clang-format-18 +Package: clang-format-19 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm18 (= ${binary:Version}) + libllvm19 (= ${binary:Version}) Description: Tool to format C/C++/Obj-C code Clang-format is both a library and a stand-alone tool with the goal of automatically reformatting C++ sources files according to configurable @@ -90,23 +90,23 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: clang-tidy-18 +Package: clang-tidy-19 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}), - clang-tools-18, python3-yaml + libllvm19 (= ${binary:Version}), + libclang-common-19-dev (= ${source:Version}), + clang-tools-19, python3-yaml Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming errors, like style violations, interface misuse, or bugs that can be deduced via static analysis. clang-tidy is modular and provides a convenient interface for writing new checks. -Package: clangd-18 +Package: clangd-19 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libllvm18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}), + libllvm19 (= ${binary:Version}), + libclang-common-19-dev (= ${source:Version}), Description: Language server that provides IDE-like features to editors clangd understands your C++ code and adds smart features to your editor: - code completion @@ -117,7 +117,7 @@ Description: Language server that provides IDE-like features to editors clangd is a language server that implements the Language Server Protocol; it can work with many editors through a plugin. -Package: clang-18-doc +Package: clang-19-doc Architecture: all Multi-Arch: foreign Section: doc @@ -132,7 +132,7 @@ Description: C, C++ and Objective-C compiler - Documentation . This package contains the documentation. -Package: libclang1-18 +Package: libclang1-19 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -153,12 +153,12 @@ Description: C interface to the Clang library locations with elements within the AST, and other facilities that support Clang-based development tools. -Package: libclang-18-dev +Package: libclang-19-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang1-18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}) + ${dep:devlibs-objc}, libclang1-19 (= ${binary:Version}), + libclang-common-19-dev (= ${source:Version}) Description: Clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -168,14 +168,14 @@ Description: Clang library - Development package provides most of the support of C++20. . This package contains the Clang headers to develop extensions over - libclang1-18. + libclang1-19. -Package: libclang-common-18-dev +Package: libclang-common-19-dev Architecture: all Multi-Arch: foreign Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, -Recommends: libclang-rt-18-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) +Recommends: libclang-rt-19-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -188,7 +188,7 @@ Description: Clang library - Common development package # ------------- compiler-rt ------------- -Package: libclang-rt-18-dev +Package: libclang-rt-19-dev Architecture: any Multi-Arch: same Section: libdevel @@ -204,7 +204,7 @@ Description: Compiler-rt - development package DataFlowSanitizer, etc * profile - Library which is used to collect coverage information. -Package: libclang-rt-18-dev-wasm32 +Package: libclang-rt-19-dev-wasm32 Architecture: all Multi-Arch: foreign Section: libdevel @@ -212,7 +212,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Description: Compiler-rt - wasm32 builtins Provides the compiler-rt builtins for WebAssembly 32 bits -Package: libclang-rt-18-dev-wasm64 +Package: libclang-rt-19-dev-wasm64 Architecture: all Multi-Arch: foreign Section: libdevel @@ -222,7 +222,7 @@ Description: Compiler-rt - wasm64 builtins # ------------- polly ------------- -Package: libpolly-18-dev +Package: libpolly-19-dev Architecture: any Multi-Arch: same Section: libdevel @@ -233,10 +233,10 @@ Description: High-level loop and data-locality optimizer # ------------- clang libraries ------------- -Package: libclang-cpp18 +Package: libclang-cpp19 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: C++ interface to the Clang library Clang project is a C, C++, Objective C and Objective C++ front-end @@ -254,12 +254,12 @@ Description: C++ interface to the Clang library locations with elements within the AST, and other facilities that support Clang-based development tools. -Package: libclang-cpp18-dev +Package: libclang-cpp19-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-cpp18 (= ${binary:Version}) -# Move of libclang-cpp.so into libclang-cpp18.dev + libclang-cpp19 (= ${binary:Version}) +# Move of libclang-cpp.so into libclang-cpp19.dev Description: C++ interface to the Clang library Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -280,10 +280,10 @@ Description: C++ interface to the Clang library linker at build time. -Package: libfuzzer-18-dev +Package: libfuzzer-19-dev Architecture: linux-any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-18 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-19 (= ${binary:Version}) Description: Library for coverage-guided fuzz testing LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing of other libraries. @@ -301,10 +301,10 @@ Description: Library for coverage-guided fuzz testing instrumentation. -Package: python3-clang-18 +Package: python3-clang-19 Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-18-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-19-dev Replaces: python-clang-x.y, Conflicts: python-clang-x.y Provides: python-clang-x.y @@ -318,7 +318,7 @@ Description: Clang Python Bindings . This binding package provides access to the Clang compiler and libraries. -Package: clang-18-examples +Package: clang-19-examples Architecture: all Multi-Arch: foreign Section: doc @@ -335,7 +335,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm18 +Package: libllvm19 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -348,7 +348,7 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: llvm-18-linker-tools +Package: llvm-19-linker-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Modular compiler and toolchain technologies - Plugins @@ -358,13 +358,13 @@ Description: Modular compiler and toolchain technologies - Plugins . This package contains the LLVMgold and LLVMPolly linker plugins. -Package: llvm-18 +Package: llvm-19 Architecture: any -Suggests: llvm-18-doc -Depends: llvm-18-runtime (= ${binary:Version}), - llvm-18-linker-tools (= ${binary:Version}), +Suggests: llvm-19-doc +Depends: llvm-19-runtime (= ${binary:Version}), + llvm-19-linker-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-18-dev +Recommends: llvm-19-dev Description: Modular compiler and toolchain technologies LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -388,7 +388,7 @@ Description: Modular compiler and toolchain technologies a young scheme front-end, and Java support is in development. LLVM can generate code for X96, SparcV10, PowerPC or many other architectures. -Package: llvm-18-runtime +Package: llvm-19-runtime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: binfmt-support | systemd @@ -408,11 +408,11 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-18-dev +Package: llvm-19-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, - llvm-18 (= ${binary:Version}), libllvm18 (= ${binary:Version}), libncurses-dev, - llvm-18-tools (= ${binary:Version}), libclang-cpp18 (= ${binary:Version}), + llvm-19 (= ${binary:Version}), libllvm19 (= ${binary:Version}), libncurses-dev, + llvm-19-tools (= ${binary:Version}), libclang-cpp19 (= ${binary:Version}), libz3-dev, libxml2-dev Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build @@ -430,7 +430,7 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: llvm-18-tools +Package: llvm-19-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, python3-pygments, python3-yaml, @@ -450,11 +450,11 @@ Description: Modular compiler and toolchain technologies, tools . This package provides tools for testing. -Package: libllvm-18-ocaml-dev +Package: libllvm-19-ocaml-dev Section: ocaml Architecture: amd64 arm64 armhf ppc64el s390x riscv64 -Suggests: llvm-18-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-18-dev (= ${binary:Version}) +Suggests: llvm-19-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-19-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev Conflicts: libllvm-x.y-ocaml-dev Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev @@ -473,7 +473,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-18-doc +Package: llvm-19-doc Section: doc Architecture: all Multi-Arch: foreign @@ -493,10 +493,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-18-examples +Package: llvm-19-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-18-dev (>= ${source:Version}), llvm-18-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-19-dev (>= ${source:Version}), llvm-19-dev (<< ${source:Version}+c~) Description: Modular compiler and toolchain technologies, examples LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -516,20 +516,20 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- -Package: lld-18 +Package: lld-19 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: LLVM-based linker LLD is a new, high-performance linker. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM Project. -Package: liblld-18 +Package: liblld-19 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: LLVM-based linker, library @@ -539,12 +539,12 @@ Description: LLVM-based linker, library . This package contains the LLD runtime library. -Package: liblld-18-dev +Package: liblld-19-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lld-18 (= ${binary:Version}), - liblld-18 (= ${binary:Version}), libzstd-dev, zlib1g-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, lld-19 (= ${binary:Version}), + liblld-19 (= ${binary:Version}), libzstd-dev, zlib1g-dev Pre-Depends: ${misc:Pre-Depends} Description: LLVM-based linker, header files LLD is a new, high-performance linker. It is built as a set of reusable @@ -556,21 +556,21 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- -Package: lldb-18 +Package: lldb-19 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}), - python3-lldb-18 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}), + python3-lldb-19 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM Project, such as the Clang expression parser and LLVM disassembler. -Package: liblldb-18 +Package: liblldb-19 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: Next generation, high-performance debugger, library @@ -580,11 +580,11 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. -Package: python3-lldb-18 +Package: python3-lldb-19 Section: python Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-18 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-19 (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y Provides: python3-lldb-x.y @@ -596,11 +596,11 @@ Description: Next generation, high-performance debugger, python3 lib . This binding package provides access to lldb. -Package: liblldb-18-dev +Package: liblldb-19-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-18 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files LLDB is a next generation, high-performance debugger. It is built as a set of @@ -614,11 +614,11 @@ Description: Next generation, high-performance debugger, header files # 44 because it was the first version in which openmp & libc++ have been # managed in llvm-defaults -Package: libomp-18-dev +Package: libomp-19-dev Section: libdevel Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 -Depends: libomp5-18 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: libomp-18-doc +Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: libomp-19-doc Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) Provides: libomp-x.y-dev Conflicts: libomp-x.y-dev @@ -628,7 +628,7 @@ Description: LLVM OpenMP runtime - dev package linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp5-18 +Package: libomp5-19 Multi-Arch: same Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} @@ -641,7 +641,7 @@ Description: LLVM OpenMP runtime linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp-18-doc +Package: libomp-19-doc Section: doc Architecture: all Multi-Arch: foreign @@ -657,7 +657,7 @@ Description: LLVM OpenMP runtime - Documentation # ------------- libcxx ------------- -Package: libc++1-18 +Package: libc++1-19 Section: libs Architecture: any Multi-Arch: same @@ -681,17 +681,17 @@ Description: LLVM C++ Standard library as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-18-dev +Package: libc++-19-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++1-18 (= ${binary:Version}), ${misc:Depends}, - libc++abi-18-dev (= ${binary:Version}), - libunwind-18-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] -Breaks: libc++-dev (<< 44), libc++abi-18-dev (<< 1:18~++20231211102647+75193b192ad9-1) +Depends: libc++1-19 (= ${binary:Version}), ${misc:Depends}, + libc++abi-19-dev (= ${binary:Version}), + libunwind-19-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] +Breaks: libc++-dev (<< 44), libc++abi-19-dev (<< 1:19~++20231211102647+75193b192ad9-1) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -Replaces: libc++-x.y-dev, libc++abi-18-dev (<< 1:18~++20231211102647+75193b192ad9-1) +Replaces: libc++-x.y-dev, libc++abi-19-dev (<< 1:19~++20231211102647+75193b192ad9-1) Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library . @@ -705,11 +705,11 @@ Description: LLVM C++ Standard library (development files) as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-18-dev-wasm32 +Package: libc++-19-dev-wasm32 Section: libdevel Architecture: all Multi-Arch: foreign -Depends: wasi-libc, libc++abi-18-dev-wasm32, ${misc:Depends} +Depends: wasi-libc, libc++abi-19-dev-wasm32, ${misc:Depends} Provides: libc++-x.y-dev-wasm32 Conflicts: libc++-x.y-dev-wasm32 Replaces: libc++-x.y-dev-wasm32 @@ -730,7 +730,7 @@ Description: LLVM C++ Standard library (WASI) # ------------- libcxxabi ------------- -Package: libc++abi1-18 +Package: libc++abi1-19 Section: libs Architecture: any Multi-Arch: same @@ -749,11 +749,11 @@ Description: LLVM low level support for a standard C++ library * Correctness as defined by the C++ standards. * Provide a portable sublayer to ease the porting of libc++ -Package: libc++abi-18-dev +Package: libc++abi-19-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++abi1-18 (= ${binary:Version}), ${misc:Depends} +Depends: libc++abi1-19 (= ${binary:Version}), ${misc:Depends} Breaks: libc++abi-dev (<= 44) Provides: libc++abi-x.y-dev Conflicts: libc++abi-x.y-dev @@ -767,7 +767,7 @@ Description: LLVM low level support for a standard C++ library (development file * Correctness as defined by the C++ standards. * Provide a portable sublayer to ease the porting of libc++ -Package: libc++abi-18-dev-wasm32 +Package: libc++abi-19-dev-wasm32 Section: libdevel Architecture: all Multi-Arch: foreign @@ -788,14 +788,14 @@ Description: LLVM low level support for a standard C++ library (WASI) # ------------- libclc ------------- -Package: libclc-18 +Package: libclc-19 Section: libs Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, - libclc-18-dev (= ${binary:Version}), - libclang-common-18-dev, + libclc-19-dev (= ${binary:Version}), + libclang-common-19-dev, Breaks: libclc-amdgcn, libclc-ptx, libclc-r600 Provides: libclc-x.y Conflicts: libclc-x.y @@ -807,7 +807,7 @@ Description: OpenCL C language implementation - platform support This package contains support for the amdgcn (AMD GPU), PTX and r600 platforms. -Package: libclc-18-dev +Package: libclc-19-dev Section: libdevel Architecture: all Multi-Arch: foreign @@ -825,7 +825,7 @@ Description: OpenCL C language implementation - development files # ------------- libunwind ------------- -Package: libunwind-18 +Package: libunwind-19 Section: libs Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same @@ -842,13 +842,13 @@ Description: production-quality unwinder or to operate on another process (aka remote), but only the local path has been implemented. Remote unwinding remains as future work. -Package: libunwind-18-dev +Package: libunwind-19-dev Section: libdevel Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${misc:Depends}, - libunwind-18 (= ${binary:Version}) + libunwind-19 (= ${binary:Version}) Provides: libunwind-dev, libunwind-x.y-dev Conflicts: libunwind-dev, libunwind-x.y-dev Replaces: libunwind-dev, libunwind-x.y-dev @@ -862,7 +862,7 @@ Description: production-quality unwinder # ------------- mlir ------------- -Package: mlir-18-tools +Package: mlir-19-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Multi-Level Intermediate Representation tools @@ -873,7 +873,7 @@ Description: Multi-Level Intermediate Representation tools . This package provides tools. -Package: libmlir-18 +Package: libmlir-19 Section: libs Architecture: any Multi-Arch: same @@ -889,13 +889,13 @@ Description: Multi-Level Intermediate Representation library specific compilers, and aid in connecting existing compilers together. -Package: libmlir-18-dev +Package: libmlir-19-dev Section: libdevel Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libmlir-18 (= ${binary:Version}) + libmlir-19 (= ${binary:Version}) Breaks: libmlir-dev Provides: libmlir-x.y-dev Conflicts: libmlir-x.y-dev @@ -909,16 +909,16 @@ Description: Multi-Level Intermediate Representation library # ------------- bolt ------------- -Package: bolt-18 +Package: bolt-19 Architecture: amd64 # Disable on arm64 because libbolt_rt_hugify.a isn't generated -Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-18-dev (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-19-dev (= ${binary:Version}), Pre-Depends: ${misc:Pre-Depends} Description: Post-link optimizer It achieves the improvements by optimizing application's code layout based on execution profile gathered by sampling profiler. -Package: libbolt-18-dev +Package: libbolt-19-dev Section: libdevel Architecture: amd64 #arm64 @@ -929,11 +929,11 @@ Description: Post-link optimizer # ------------- flang ------------- -Package: flang-18 +Package: flang-19 # no 32bit support # https://github.com/llvm/llvm-project/issues/59845 Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-18-dev (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-19-dev (= ${binary:Version}), Provides: fortran-compiler, gfortran-mod-15 Description: Fortran compiler Ground-up implementation of a Fortran front end written in @@ -942,7 +942,7 @@ Description: Fortran compiler While it is capable of generating executables for a number of examples, some functionalities are still missing. -Package: libflang-18-dev +Package: libflang-19-dev Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index 72b34451..94e3cd20 100644 --- a/debian/patches/clang-analyzer-force-version.diff +++ b/debian/patches/clang-analyzer-force-version.diff @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan $Clang = $ENV{'CLANG_CXX'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-18'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-19'; } $IsCXX = 1 } @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan $Clang = $ENV{'CLANG'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-18'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-19'; } $IsCXX = 0 } diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 5e00d38c..29f8389e 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan parser.add_argument( "-binary", - default="clang-format", -+ default="clang-format-18", ++ default="clang-format-19", help="location of binary to use for clang-format", ) args = parser.parse_args() @@ -26,7 +26,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan (defcustom clang-format-executable - (or (executable-find "clang-format") -+ (or (executable-find "clang-format-18") ++ (or (executable-find "clang-format-19") "clang-format") "Location of the clang-format executable. @@ -39,7 +39,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan # 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-18" ++binary = "clang-format-19" if vim.eval('exists("g:clang_format_path")') == "1": 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 4f61f44f..5786c229 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -1,19 +1,19 @@ -Index: llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-snapshot_19~++20231101090856+e144ae54dcb9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +--- llvm-toolchain-snapshot_19~++20231101090856+e144ae54dcb9.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py ++++ llvm-toolchain-snapshot_19~++20231101090856+e144ae54dcb9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py @@ -260,10 +260,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-18', ++ default='clang-tidy-19', + help="path to clang-tidy binary" ) parser.add_argument( "-clang-apply-replacements-binary", -+ default='clang-apply-replacements-18', ++ default='clang-apply-replacements-19', metavar="PATH", help="path to clang-apply-replacements binary", ) diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff index c371314d..e089b520 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -2,11 +2,11 @@ Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan- =================================================================== --- llvm-toolchain-snapshot_17~++20200326172000+4673699a470.orig/clang/tools/scan-view/bin/scan-view +++ llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view -@@ -28,6 +28,7 @@ kDefaultPort = 8181 +@@ -28,6 +28,7 @@ kDefaultPort = 8191 kMaxPortsToTry = 100 ### -+BASE_DIR = '/usr/share/clang/scan-view-18' ++BASE_DIR = '/usr/share/clang/scan-view-19' def url_is_up(url): diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 7efb1df0..9affdf2a 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/p file = "libclang.dll" else: - file = "libclang.so" -+ file = "libclang-18.so" ++ file = "libclang-19.so" if Config.library_path: file = Config.library_path + "/" + file diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 1876f348..b985062f 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); if (!defined $Clang || ! -x $Clang) { - $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang"); -+ $Clang = Cwd::realpath("/usr/lib/llvm-18/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-19/bin/clang"); if (!defined $Clang || ! -x $Clang) { # When an Xcode toolchain is present, look for a clang in the sibling bin # of the parent of the bin directory. So if scan-build is at diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff index 0f194578..e4f80da9 100644 --- a/debian/patches/scan-build-py-fix-default-bin.diff +++ b/debian/patches/scan-build-py-fix-default-bin.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan metavar="", dest="clang", - default="clang", -+ default="clang-18", ++ default="clang-19", 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.""", diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 69dcd4c8..7b0b464e 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -1,10 +1,10 @@ #!/bin/sh -ORIG_VERSION=16 -TARGET_VERSION=17 -ORIG_VERSION_2=16_0 -TARGET_VERSION_2=17_0 -ORIG_VERSION_3=160 -TARGET_VERSION_3=170 +ORIG_VERSION=18 +TARGET_VERSION=19 +ORIG_VERSION_2=18_0 +TARGET_VERSION_2=19_0 +ORIG_VERSION_3=180 +TARGET_VERSION_3=190 LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control debian/tests/integration-test-suite-test debian/unpack.sh debian/tests/cmake-test debian/patches/scan-build-py-fix-default-bin.diff` for F in $LIST; do diff --git a/debian/unpack.sh b/debian/unpack.sh index 155dbc76..b83f6004 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -1,6 +1,6 @@ set -e ORIG_VERSION=snapshot -MAJOR_VERSION=18 # 8.0.1 +MAJOR_VERSION=19 # 8.0.1 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru` VERSION=$REV From 4c32e531c9f81d9dd40023afab35157b24f9cea3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 14:08:32 +0100 Subject: [PATCH 002/241] branch of 19 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 48581e22..e7de3adc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp2) experimental; urgency=medium +llvm-toolchain-snapshot (1:19~++20231211102647+75193b192ad9-1~exp2) experimental; urgency=medium + * branch of 19 * refresh libomp5 symbol list * For the usage of -DLIBCXXABI_USE_LLVM_UNWINDER=OFF when we don't build unwind https://github.com/llvm/llvm-project/issues/77846 From f772867c0533f59980cadfe4600853f8d47ca731 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 14:08:55 +0100 Subject: [PATCH 003/241] remove changelog artifact --- debian/changelog | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7de3adc..108e4cf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,19 +69,6 @@ llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 -llvm-toolchain-snapshot (1:18~++20230910052457+7560356a832f-1~exp1) experimental; urgency=medium - - * New snapshot release - - -- Sylvestre Ledru Sun, 10 Sep 2023 17:26:28 +0200 - -llvm-toolchain-snapshot (1:18~++20230907020249+c16adb0dcb1f-1~exp1) UNRELEASED; urgency=medium - - * experimental New snapshot release - * experimental New snapshot release - - -- Sylvestre Ledru Thu, 07 Sep 2023 14:04:25 +0200 - llvm-toolchain-snapshot (1:18~++20230818040015+c931f2e6fd0c-1~exp2) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] From 30d03737dde025bc3355b77a3abe19b91a48ef2c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 25 Jan 2024 09:19:38 +0100 Subject: [PATCH 004/241] rebase of the patch --- .../23-strlcpy_strlcat_warning_removed.diff | 86 +++++++++---------- 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index be74dd9e..72909fc1 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,37 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/include/clang/Basic/Builtins.def -@@ -645,8 +645,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz - BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") - BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") - BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF") --BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF") --BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF") -+//BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF") -+//BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF") - BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") - BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") - BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF") -@@ -1182,8 +1182,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", - LIBBUILTIN(_longjmp, "vJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES) - LIBBUILTIN(siglongjmp, "vSJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES) - // non-standard but very common --LIBBUILTIN(strlcpy, "zc*cC*z", "f", STRING_H, ALL_GNU_LANGUAGES) --LIBBUILTIN(strlcat, "zc*cC*z", "f", STRING_H, ALL_GNU_LANGUAGES) -+//LIBBUILTIN(strlcpy, "zc*cC*z", "f", STRING_H, ALL_GNU_LANGUAGES) -+//LIBBUILTIN(strlcat, "zc*cC*z", "f", STRING_H, ALL_GNU_LANGUAGES) - // id objc_msgSend(id, SEL, ...) - LIBBUILTIN(objc_msgSend, "GGH.", "f", OBJC_MESSAGE_H, OBJC_LANG) - // long double objc_msgSend_fpret(id self, SEL op, ...) -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/AST/Decl.cpp -=================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/AST/Decl.cpp -@@ -4310,13 +4310,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/Decl.cpp +@@ -4368,13 +4368,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -57,11 +31,11 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/SemaChecking.cpp -@@ -1263,8 +1263,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/SemaChecking.cpp +@@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memset_chk: @@ -72,7 +46,7 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -6964,10 +6964,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -7699,10 +7699,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -85,11 +59,11 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -717,10 +717,10 @@ void GenericTaintChecker::initTaintRules +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, @@ -102,10 +76,10 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Static {{CDF_MaybeBuiltin, {{"snprintf"}}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, {{CDF_MaybeBuiltin, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -137,10 +111,10 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -197,3 +171,25 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/clang/Basic/Builtins.td +=================================================================== +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/clang/Basic/Builtins.td +@@ -3199,7 +3199,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h + + // non-standard but very common + +-def StrlCpy : GNULibBuiltin<"string.h"> { ++/* ++ def StrlCpy : GNULibBuiltin<"string.h"> { + let Spellings = ["strlcpy"]; + let Prototype = "size_t(char*, char const*, size_t)"; + } +@@ -3208,6 +3209,7 @@ def StrlCat : GNULibBuiltin<"string.h"> + let Spellings = ["strlcat"]; + let Prototype = "size_t(char*, char const*, size_t)"; + } ++*/ + + def ObjcMsgSend : ObjCLibBuiltin<"objc_message.h"> { + let Spellings = ["objc_msgSend"]; From badd6b9acbdea205022fd0ce3856d37d8627109b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 25 Jan 2024 10:55:02 +0100 Subject: [PATCH 005/241] pre upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 29fe4c3e..70018fd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:19~++20231211102647+75193b192ad9-1~exp2) experimental; urgency=medium +llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental; urgency=medium * branch of 19 * refresh libomp5 symbol list From 36ac0a506320175ffae02de8f464359d1748ed35 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 25 Jan 2024 14:51:16 +0100 Subject: [PATCH 006/241] fix the date --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 70018fd1..0d22b827 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental * remove the unconditionnaly defined -DLIBUNWIND_USE_COMPILER_RT=ON * Also pass -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF to libcxx-wasm32-wasi builds - -- Sylvestre Ledru Fri, 12 Jan 2024 18:33:31 +0100 + -- Sylvestre Ledru Thu, 25 Jan 2024 14:51:10 +0100 llvm-toolchain-18 (1:18~++20240124100819+22683463740e-1~exp1) experimental; urgency=medium From c34e9c285dac63cb510440ce54ad6a047189caf6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 25 Jan 2024 17:48:08 +0100 Subject: [PATCH 007/241] hwasan_symbolize is now built also on i386 --- debian/changelog | 6 ++++++ debian/clang-tools-X.Y.install.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0d22b827..f4667e12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp2) UNRELEASED; urgency=medium + + * hwasan_symbolize is now built also on i386 + + -- Sylvestre Ledru Thu, 25 Jan 2024 17:45:39 +0100 + llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental; urgency=medium * branch of 19 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index d69cd402..1394605f 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -62,7 +62,7 @@ usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++ usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / HWASAN_SUPPORTED_ARCH -[amd64 arm64 riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize +[amd64 arm64 riscv64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ From 2119359440b9c734e5c2672017030cd071036c53 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 6 Feb 2024 07:40:58 +0100 Subject: [PATCH 008/241] Update of the libomp symbols --- debian/changelog | 1 + debian/libomp5-X.Y.symbols.in | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4667e12..a98d8c81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp2) UNRELEASED; urgency=medium * hwasan_symbolize is now built also on i386 + * Update of the libomp symbols -- Sylvestre Ledru Thu, 25 Jan 2024 17:45:39 +0100 diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in index ed02c9d8..8875fc10 100644 --- a/debian/libomp5-X.Y.symbols.in +++ b/debian/libomp5-X.Y.symbols.in @@ -1364,6 +1364,8 @@ libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_data_submit_async@VERS1.0 17 __tgt_rtl_data_unlock@VERS1.0 17 __tgt_rtl_destroy_event@VERS1.0 17 + __tgt_rtl_get_function@VERS1.0 19 + __tgt_rtl_get_global@VERS1.0 19 __tgt_rtl_init_async_info@VERS1.0 17 __tgt_rtl_init_device@VERS1.0 17 __tgt_rtl_init_device_info@VERS1.0 17 @@ -1371,6 +1373,7 @@ libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_init_requires@VERS1.0 17 __tgt_rtl_initialize_record_replay@VERS1.0 18 __tgt_rtl_is_data_exchangable@VERS1.0 17 + __tgt_rtl_is_valid_binary@VERS1.0 19 __tgt_rtl_launch_kernel@VERS1.0 17 __tgt_rtl_load_binary@VERS1.0 17 __tgt_rtl_number_of_devices@VERS1.0 17 @@ -1379,9 +1382,10 @@ libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_record_event@VERS1.0 17 __tgt_rtl_set_device_offset@VERS1.0 18 __tgt_rtl_set_info_flag@VERS1.0 17 - __tgt_rtl_supports_empty_images@VERS1.0 17 +#MISSING: 19# __tgt_rtl_supports_empty_images@VERS1.0 17 __tgt_rtl_sync_event@VERS1.0 17 __tgt_rtl_synchronize@VERS1.0 17 + __tgt_rtl_use_auto_zero_copy@VERS1.0 19 __tgt_rtl_wait_event@VERS1.0 17 libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# VERS1.0@VERS1.0 17 @@ -1399,6 +1403,8 @@ libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_data_submit_async@VERS1.0 17 __tgt_rtl_data_unlock@VERS1.0 17 __tgt_rtl_destroy_event@VERS1.0 17 + __tgt_rtl_get_function@VERS1.0 19 + __tgt_rtl_get_global@VERS1.0 19 __tgt_rtl_init_async_info@VERS1.0 17 __tgt_rtl_init_device@VERS1.0 17 __tgt_rtl_init_device_info@VERS1.0 17 @@ -1406,6 +1412,7 @@ libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_init_requires@VERS1.0 17 __tgt_rtl_initialize_record_replay@VERS1.0 18 __tgt_rtl_is_data_exchangable@VERS1.0 17 + __tgt_rtl_is_valid_binary@VERS1.0 19 __tgt_rtl_launch_kernel@VERS1.0 17 __tgt_rtl_load_binary@VERS1.0 17 __tgt_rtl_number_of_devices@VERS1.0 17 @@ -1414,9 +1421,10 @@ libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_record_event@VERS1.0 17 __tgt_rtl_set_device_offset@VERS1.0 18 __tgt_rtl_set_info_flag@VERS1.0 17 - __tgt_rtl_supports_empty_images@VERS1.0 17 +#MISSING: 19# __tgt_rtl_supports_empty_images@VERS1.0 17 __tgt_rtl_sync_event@VERS1.0 17 __tgt_rtl_synchronize@VERS1.0 17 + __tgt_rtl_use_auto_zero_copy@VERS1.0 19 __tgt_rtl_wait_event@VERS1.0 17 libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# VERS1.0@VERS1.0 17 @@ -1434,6 +1442,8 @@ libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_data_submit_async@VERS1.0 17 __tgt_rtl_data_unlock@VERS1.0 17 __tgt_rtl_destroy_event@VERS1.0 17 + __tgt_rtl_get_function@VERS1.0 19 + __tgt_rtl_get_global@VERS1.0 19 __tgt_rtl_init_async_info@VERS1.0 17 __tgt_rtl_init_device@VERS1.0 17 __tgt_rtl_init_device_info@VERS1.0 17 @@ -1441,6 +1451,7 @@ libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_init_requires@VERS1.0 17 __tgt_rtl_initialize_record_replay@VERS1.0 18 __tgt_rtl_is_data_exchangable@VERS1.0 17 + __tgt_rtl_is_valid_binary@VERS1.0 19 __tgt_rtl_launch_kernel@VERS1.0 17 __tgt_rtl_load_binary@VERS1.0 17 __tgt_rtl_number_of_devices@VERS1.0 17 @@ -1449,9 +1460,10 @@ libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_record_event@VERS1.0 17 __tgt_rtl_set_device_offset@VERS1.0 18 __tgt_rtl_set_info_flag@VERS1.0 17 - __tgt_rtl_supports_empty_images@VERS1.0 17 +#MISSING: 19# __tgt_rtl_supports_empty_images@VERS1.0 17 __tgt_rtl_sync_event@VERS1.0 17 __tgt_rtl_synchronize@VERS1.0 17 + __tgt_rtl_use_auto_zero_copy@VERS1.0 19 __tgt_rtl_wait_event@VERS1.0 17 libomptarget.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# VERS1.0@VERS1.0 17 From 5162aed5c49145ccb62d0abc16da53726b896f96 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 16 Feb 2024 09:51:01 +0100 Subject: [PATCH 009/241] Install *clang_rt* on sparc and sparc64 --- debian/changelog | 4 ++++ debian/libclang-rt-X.Y-dev.install.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 499cbb0f..e43125ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp2) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * hwasan_symbolize is now built also on i386 * Update of the libomp symbols + [ John Paul Adrian Glaubitz ] + * Install *clang_rt* on sparc and sparc64 + -- Sylvestre Ledru Thu, 25 Jan 2024 17:45:39 +0100 llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental; urgency=medium diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index 8b973ead..cd2a8425 100644 --- a/debian/libclang-rt-X.Y-dev.install.in +++ b/debian/libclang-rt-X.Y-dev.install.in @@ -2,7 +2,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/sanitizer/ -[!sparc !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt* +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt* usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h From 042d184430de496d2d2805a855256375ab317e0f Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 16 Feb 2024 09:51:59 +0100 Subject: [PATCH 010/241] Run chrpath for libclang on sparc and sparc64 --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e43125ea..082859a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp2) UNRELEASED; [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 + * Run chrpath for libclang on sparc and sparc64 -- Sylvestre Ledru Thu, 25 Jan 2024 17:45:39 +0100 diff --git a/debian/rules b/debian/rules index 00a2432a..459f56c0 100755 --- a/debian/rules +++ b/debian/rules @@ -1126,7 +1126,7 @@ override_dh_auto_install: # Only run on executable, not script chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1` -ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64)) +ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe)) ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux)) # To fix custom-library-search-path chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so From 0f2646e14e9af7ed0449fdafdc422eb980f056aa Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Feb 2024 12:51:51 +0100 Subject: [PATCH 011/241] rebase of all patches --- debian/patches/0044-soname.diff | 21 +++-- ...-html_static_path-_static-everywhere.patch | 24 +++--- ...e-Debian-provided-MathJax-everywhere.patch | 44 +++++----- .../23-strlcpy_strlcat_warning_removed.diff | 44 +++++----- debian/patches/26-set-correct-float-abi.diff | 8 +- debian/patches/930008-arm.diff | 8 +- debian/patches/D148945-revert.diff | 8 +- debian/patches/arm32-defaults.diff | 8 +- .../clang-arm-default-vfp3-on-armv7a.patch | 14 +-- debian/patches/clang-format-version.diff | 22 ++--- ...pilerrt-build-scudo-standalone-option.diff | 8 +- .../compilerrt-builtins-arch-fix-armhf.diff | 8 +- debian/patches/declare_clear_cache.diff | 8 +- debian/patches/disable-path-test-failing.diff | 12 +-- debian/patches/disable-sse2-old-x86.diff | 8 +- debian/patches/fix-clang-path-and-build.diff | 10 +-- debian/patches/fix-scan-view-path.diff | 10 +-- debian/patches/force-sse2-compiler-rt.diff | 8 +- debian/patches/hurd/hurd-pathmax.diff | 14 +-- debian/patches/issue-54242.diff | 8 +- .../patches/libclang-major-version-only.diff | 8 +- .../libcxx-libatomic-only-with-gcc-rtlib.diff | 8 +- .../libcxx/libcxxabi-arm-ehabi-fix.patch | 20 ++--- .../libcxx/libcxxabi-fix-link-builtins.diff | 8 +- ...test-don-t-fail-extended-long-double.patch | 8 +- ...ddversion-suffix-to-llvm-server-exec.patch | 10 +-- debian/patches/lldb/lldb-soname.diff | 10 +-- debian/patches/lldb/print-lldb-path.patch | 14 +-- .../llvm-runtimes-builtins-build-check.diff | 8 +- debian/patches/lower-python-dep.diff | 8 +- debian/patches/mips/mips-D101773-reloc.patch | 8 +- debian/patches/mips/mips-force-nomadd4.patch | 8 +- debian/patches/omp-riscv64.patch | 8 +- debian/patches/openmp-fix-runtimes-build.diff | 56 ++++++------ debian/patches/openmp-soname.diff | 8 +- debian/patches/python-clangpath.diff | 8 +- .../patches/remove-apple-clang-manpage.diff | 10 +-- debian/patches/revert-update-doc.diff | 42 ++++----- debian/patches/scan-build-clang-path.diff | 8 +- debian/patches/scan-view-fix-path.diff | 8 +- debian/patches/silent-gold-utils.diff | 86 +++++++++---------- debian/patches/symbolizer-path.diff | 18 ++-- debian/patches/unbreak-atomic-mips.diff | 8 +- debian/patches/unwind-chain-inclusion.diff | 8 +- debian/patches/unwind-force-pthread-dl.diff | 8 +- .../wasm/wasm-compiler-rt-default.diff | 16 ++-- debian/patches/wasm/wasm-ld-path.diff | 8 +- debian/patches/wasm/wasm-sysroot-usr.diff | 26 +++--- 48 files changed, 374 insertions(+), 365 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 4ef51f2b..42c0d66f 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -3,11 +3,11 @@ tools/llvm-shlib/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/clang/tools/libclang/CMakeLists.txt -@@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +@@ -135,7 +135,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,17 +16,16 @@ Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/llvm/tools/llvm-shlib/CMakeLists.txt -@@ -35,6 +35,8 @@ if(LLVM_BUILD_LLVM_DYLIB) - endif() - add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/tools/llvm-shlib/CMakeLists.txt +@@ -38,6 +38,8 @@ if(LLVM_BUILD_LLVM_DYLIB) + get_target_property(LLVM_DYLIB_FILENAME LLVM OUTPUT_NAME) + llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} ${LLVM_DYLIB_FILENAME} SHARED COMPONENT LLVM) + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + list(REMOVE_DUPLICATES LIB_NAMES) if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) - diff --git a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch index bf287bca..68e95358 100644 --- a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch +++ b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch @@ -9,11 +9,11 @@ Subject: Set html_static_path = ['_static'] everywhere. polly/docs/conf.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/analyzer/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/analyzer/conf.py -@@ -121,7 +121,7 @@ html_theme = 'haiku' +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py +@@ -118,7 +118,7 @@ html_theme = "haiku" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". @@ -22,11 +22,11 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/analyz # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/conf.py -@@ -122,7 +122,7 @@ html_theme = 'haiku' +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +@@ -118,7 +118,7 @@ html_theme = "haiku" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". @@ -35,11 +35,11 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/conf.p # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/polly/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/polly/docs/conf.py -@@ -127,7 +127,7 @@ except ImportError: +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py +@@ -124,7 +124,7 @@ except ImportError: # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch index 39c2ff05..9e137ac9 100644 --- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch +++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch @@ -13,10 +13,10 @@ Subject: Use Debian-provided MathJax everywhere. polly/docs/doxygen.cfg.in | 2 +- 8 files changed, 14 insertions(+), 5 deletions(-) -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py @@ -119,6 +119,9 @@ html_theme = "haiku" # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ["_static"] @@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extr # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. # html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang-tools-extra/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/doxygen.cfg.in @@ -1443,7 +1443,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extr # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/analyzer/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/analyzer/conf.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py @@ -120,6 +120,9 @@ html_theme = "haiku" # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -54,11 +54,11 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/analy # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. # html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py -@@ -135,6 +135,9 @@ html_theme = "haiku" +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +@@ -120,6 +120,9 @@ html_theme = "haiku" # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -68,10 +68,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf. # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. # html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/doxygen.cfg.in @@ -1432,7 +1432,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/doxyg # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/doxyge # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/polly/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 72909fc1..3199da50 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,11 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/Decl.cpp -@@ -4368,13 +4368,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/Decl.cpp +@@ -4381,13 +4381,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/SemaChecking.cpp +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/SemaChecking.cpp @@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: @@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -7699,10 +7699,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -7660,10 +7660,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -59,10 +59,10 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, @@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Static {{CDF_MaybeBuiltin, {{"snprintf"}}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, {{CDF_MaybeBuiltin, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -111,10 +111,10 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -171,11 +171,11 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} -Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/clang/Basic/Builtins.td +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/clang/Basic/Builtins.td =================================================================== ---- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/include/clang/Basic/Builtins.td -+++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/clang/Basic/Builtins.td -@@ -3199,7 +3199,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/clang/Basic/Builtins.td +@@ -3225,7 +3225,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h // non-standard but very common @@ -185,7 +185,7 @@ Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/cl let Spellings = ["strlcpy"]; let Prototype = "size_t(char*, char const*, size_t)"; } -@@ -3208,6 +3209,7 @@ def StrlCat : GNULibBuiltin<"string.h"> +@@ -3234,6 +3235,7 @@ def StrlCat : GNULibBuiltin<"string.h"> let Spellings = ["strlcat"]; let Prototype = "size_t(char*, char const*, size_t)"; } diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index 7321fd78..4d0bbb65 100644 --- a/debian/patches/26-set-correct-float-abi.diff +++ b/debian/patches/26-set-correct-float-abi.diff @@ -18,11 +18,11 @@ Forwarded: Reviewed-By: Last-Update: -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/ARM.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Arch/ARM.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/ARM.cpp -@@ -384,7 +384,7 @@ arm::FloatABI arm::getDefaultFloatABI(co +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Arch/ARM.cpp +@@ -421,7 +421,7 @@ arm::FloatABI arm::getDefaultFloatABI(co case llvm::Triple::MuslEABI: case llvm::Triple::EABI: // EABI is always AAPCS, and if it was not marked 'hard', it's softfp diff --git a/debian/patches/930008-arm.diff b/debian/patches/930008-arm.diff index 2374afcd..87479203 100644 --- a/debian/patches/930008-arm.diff +++ b/debian/patches/930008-arm.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/TargetParser/ARMTargetParser.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/ARMTargetParser.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/TargetParser/ARMTargetParser.cpp -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/TargetParser/ARMTargetParser.cpp -@@ -590,7 +590,7 @@ StringRef ARM::getARMCPUForArch(const ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -636,7 +636,7 @@ StringRef ARM::getARMCPUForArch(const ll case llvm::Triple::EABIHF: case llvm::Triple::GNUEABIHF: case llvm::Triple::MuslEABIHF: diff --git a/debian/patches/D148945-revert.diff b/debian/patches/D148945-revert.diff index 73426bdb..4deb3b72 100644 --- a/debian/patches/D148945-revert.diff +++ b/debian/patches/D148945-revert.diff @@ -3,9 +3,11 @@ Restore that for now, we're not GenToo ... https://reviews.llvm.org/D148945 https://reviews.llvm.org/D122444 ---- a/clang/lib/Driver/ToolChains/Linux.cpp -+++ b/clang/lib/Driver/ToolChains/Linux.cpp -@@ -333,6 +333,13 @@ Linux::Linux(const Driver &D, const llvm +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +@@ -337,6 +337,13 @@ Linux::Linux(const Driver &D, const llvm Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff index d3c6ece0..1cf277c4 100644 --- a/debian/patches/arm32-defaults.diff +++ b/debian/patches/arm32-defaults.diff @@ -1,6 +1,8 @@ ---- a/llvm/lib/TargetParser/ARMTargetParser.cpp -+++ b/llvm/lib/TargetParser/ARMTargetParser.cpp -@@ -637,9 +637,9 @@ StringRef ARM::getARMCPUForArch(const ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/ARMTargetParser.cpp +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -636,9 +636,9 @@ StringRef ARM::getARMCPUForArch(const ll case llvm::Triple::EABIHF: case llvm::Triple::GNUEABIHF: case llvm::Triple::MuslEABIHF: diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch index 21a0a955..f4318eb1 100644 --- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch +++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/Target/ARM/ARM.td +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Target/ARM/ARM.td =================================================================== ---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/lib/Target/ARM/ARM.td -+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/Target/ARM/ARM.td -@@ -905,7 +905,8 @@ def ARMv6sm : Architecture<"armv6s-m", +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/Target/ARM/ARM.td ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Target/ARM/ARM.td +@@ -914,7 +914,8 @@ def ARMv6sm : Architecture<"armv6s-m", FeatureStrictAlign]>; def ARMv7a : Architecture<"armv7-a", "ARMv7a", [HasV7Ops, @@ -12,10 +12,10 @@ Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/Target/ FeatureDB, FeatureDSP, FeatureAClass, -Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/ARMTargetParser.def +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/include/llvm/TargetParser/ARMTargetParser.def =================================================================== ---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def -+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/ARMTargetParser.def +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/include/llvm/TargetParser/ARMTargetParser.def @@ -68,7 +68,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "+v6 ARM_ARCH("armv6-m", ARMV6M, "6-M", "+v6m", ARMBuildAttrs::CPUArch::v6_M, FK_NONE, ARM::AEK_NONE) diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 29f8389e..22231969 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -4,11 +4,11 @@ clang/tools/clang-format/clang-format.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format-diff.py -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format-diff.py -@@ -92,7 +92,7 @@ def main(): +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/clang-format/clang-format-diff.py +@@ -93,7 +93,7 @@ def main(): ) parser.add_argument( "-binary", @@ -17,11 +17,11 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan help="location of binary to use for clang-format", ) args = parser.parse_args() -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format.el -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.el -@@ -37,7 +37,7 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/clang-format/clang-format.el +@@ -38,7 +38,7 @@ :group 'tools) (defcustom clang-format-executable @@ -30,10 +30,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan "clang-format") "Location of the clang-format executable. -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format.py -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/clang-format/clang-format.py @@ -49,7 +49,7 @@ import vim # set g:clang_format_path to the path to clang-format if it is not on the path diff --git a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff index 4430c91c..6d8840cc 100644 --- a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff +++ b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff @@ -1,10 +1,10 @@ add option to disable compiler-rt scudo standalone allocator as it is not always supported by all arch profiles such as arm5vt of ARM32 arch -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/CMakeLists.txt -@@ -303,6 +303,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/CMakeLists.txt +@@ -282,6 +282,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY include(config-ix) diff --git a/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff b/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff index 319053db..727f7d3f 100644 --- a/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff +++ b/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff @@ -1,10 +1,10 @@ fix builtins armhf default arch detection by adding the same armhf triple handling use for compiler-rt -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt -@@ -36,6 +36,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt +@@ -29,6 +29,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR load_llvm_config() endif() construct_compiler_rt_default_triple() diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff index 2869ad60..3b1462d1 100644 --- a/debian/patches/declare_clear_cache.diff +++ b/debian/patches/declare_clear_cache.diff @@ -2,11 +2,11 @@ lib/Support/Unix/Memory.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/llvm/lib/Support/Unix/Memory.inc +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Support/Unix/Memory.inc =================================================================== ---- llvm-toolchain-snapshot_16~++20221126040739+502c246519ec.orig/llvm/lib/Support/Unix/Memory.inc -+++ llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/llvm/lib/Support/Unix/Memory.inc -@@ -242,7 +242,7 @@ void Memory::InvalidateInstructionCache( +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/Support/Unix/Memory.inc ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Support/Unix/Memory.inc +@@ -243,7 +243,7 @@ void Memory::InvalidateInstructionCache( // FIXME: Can we safely always call this for __GNUC__ everywhere? const char *Start = static_cast(Addr); const char *End = Start + Len; diff --git a/debian/patches/disable-path-test-failing.diff b/debian/patches/disable-path-test-failing.diff index 62c6e0b8..79c707a0 100644 --- a/debian/patches/disable-path-test-failing.diff +++ b/debian/patches/disable-path-test-failing.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/Support/Path.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/unittests/Support/Path.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/unittests/Support/Path.cpp -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/Support/Path.cpp -@@ -679,7 +679,7 @@ protected: +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/unittests/Support/Path.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/unittests/Support/Path.cpp +@@ -680,7 +680,7 @@ protected: sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0"); } @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/S }; TEST_F(FileSystemTest, Unique) { -@@ -763,7 +763,8 @@ TEST_F(FileSystemTest, RealPath) { +@@ -768,7 +768,8 @@ TEST_F(FileSystemTest, RealPath) { // This can fail if $HOME is not set and getpwuid fails. bool Result = llvm::sys::path::home_directory(HomeDir); @@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/S checkSeparators(HomeDir); ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected)); checkSeparators(Expected); -@@ -772,6 +773,7 @@ TEST_F(FileSystemTest, RealPath) { +@@ -777,6 +778,7 @@ TEST_F(FileSystemTest, RealPath) { ASSERT_NO_ERROR(fs::real_path("~/", Actual, true)); EXPECT_EQ(Expected, Actual); } diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff index 4f5d242a..836ddd10 100644 --- a/debian/patches/disable-sse2-old-x86.diff +++ b/debian/patches/disable-sse2-old-x86.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230705085103+4ef04876ef17/llvm/lib/TargetParser/X86TargetParser.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/X86TargetParser.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230705085103+4ef04876ef17.orig/llvm/lib/TargetParser/X86TargetParser.cpp -+++ llvm-toolchain-snapshot_17~++20230705085103+4ef04876ef17/llvm/lib/TargetParser/X86TargetParser.cpp -@@ -132,7 +132,7 @@ constexpr FeatureBitset FeaturesPentium2 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/TargetParser/X86TargetParser.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/TargetParser/X86TargetParser.cpp +@@ -59,7 +59,7 @@ constexpr FeatureBitset FeaturesPentium2 constexpr FeatureBitset FeaturesPentium3 = FeaturesPentium2 | FeatureSSE; // Pentium 4 CPUs diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff index 09394fb4..689f07db 100644 --- a/debian/patches/fix-clang-path-and-build.diff +++ b/debian/patches/fix-clang-path-and-build.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Driver/ToolChains/Linux.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Driver/ToolChains/Linux.cpp -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Driver/ToolChains/Linux.cpp -@@ -12,6 +12,7 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +@@ -13,6 +13,7 @@ #include "Arch/PPC.h" #include "Arch/RISCV.h" #include "CommonArgs.h" @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Driver #include "clang/Config/config.h" #include "clang/Driver/Distro.h" #include "clang/Driver/Driver.h" -@@ -579,8 +580,18 @@ void Linux::AddClangSystemIncludeArgs(co +@@ -627,8 +628,18 @@ void Linux::AddClangSystemIncludeArgs(co SmallString<128> ResourceDirInclude(D.ResourceDir); llvm::sys::path::append(ResourceDirInclude, "include"); if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff index e089b520..60c52bdd 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_17~++20200326172000+4673699a470.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view -@@ -28,6 +28,7 @@ kDefaultPort = 8191 +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-view/bin/scan-view +@@ -27,6 +27,7 @@ kDefaultPort = 8181 kMaxPortsToTry = 100 ### @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan- def url_is_up(url): -@@ -65,7 +66,7 @@ def start_browser(port, options): +@@ -64,7 +65,7 @@ def start_browser(port, options): def run(port, options, root): # Prefer to look relative to the installed binary diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index 13a5e3f4..ce70bb99 100644 --- a/debian/patches/force-sse2-compiler-rt.diff +++ b/debian/patches/force-sse2-compiler-rt.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_18~++20231114093943+6229cd0272a8/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231114093943+6229cd0272a8.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231114093943+6229cd0272a8/compiler-rt/lib/builtins/CMakeLists.txt -@@ -764,6 +764,12 @@ else () +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt +@@ -772,6 +772,12 @@ else () append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff index fcf3bde4..d0633ec9 100644 --- a/debian/patches/hurd/hurd-pathmax.diff +++ b/debian/patches/hurd/hurd-pathmax.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/clang/lib/Basic/FileManager.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/FileManager.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745.orig/clang/lib/Basic/FileManager.cpp -+++ llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/clang/lib/Basic/FileManager.cpp -@@ -611,6 +611,12 @@ FileManager::getNoncachedStatValue(Strin +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Basic/FileManager.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/FileManager.cpp +@@ -592,6 +592,12 @@ FileManager::getNoncachedStatValue(Strin return std::error_code(); } @@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/clang/lib/Basic/ void FileManager::GetUniqueIDMapping( SmallVectorImpl &UIDToFiles) const { UIDToFiles.clear(); -Index: llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/lldb/include/lldb/lldb-defines.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/include/lldb/lldb-defines.h =================================================================== ---- llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745.orig/lldb/include/lldb/lldb-defines.h -+++ llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/lldb/include/lldb/lldb-defines.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/include/lldb/lldb-defines.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/include/lldb/lldb-defines.h @@ -15,6 +15,11 @@ #define INT32_MAX 2147483647 #endif diff --git a/debian/patches/issue-54242.diff b/debian/patches/issue-54242.diff index e32cc735..73bc5b67 100644 --- a/debian/patches/issue-54242.diff +++ b/debian/patches/issue-54242.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/mlir/lib/ExecutionEngine/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/mlir/lib/ExecutionEngine/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/mlir/lib/ExecutionEngine/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/mlir/lib/ExecutionEngine/CMakeLists.txt -@@ -57,7 +57,7 @@ endif(LLVM_USE_PERF) +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/mlir/lib/ExecutionEngine/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/mlir/lib/ExecutionEngine/CMakeLists.txt +@@ -60,7 +60,7 @@ endif(LLVM_USE_PERF) add_mlir_library(MLIRExecutionEngine ExecutionEngine.cpp diff --git a/debian/patches/libclang-major-version-only.diff b/debian/patches/libclang-major-version-only.diff index 36800f38..aec0ff25 100644 --- a/debian/patches/libclang-major-version-only.diff +++ b/debian/patches/libclang-major-version-only.diff @@ -1,6 +1,8 @@ ---- a/clang/tools/libclang/CMakeLists.txt -+++ b/clang/tools/libclang/CMakeLists.txt -@@ -196,7 +196,7 @@ +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +@@ -208,7 +208,7 @@ if(ENABLE_SHARED) OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libclang.map) set_target_properties(libclang PROPERTIES diff --git a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff index b750c4f0..5fde6eb6 100644 --- a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff +++ b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff @@ -1,9 +1,9 @@ if libatomic is found only link it if libgcc is the rtlib -Index: llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007/libcxx/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxx/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007.orig/libcxx/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007/libcxx/CMakeLists.txt -@@ -685,13 +685,16 @@ function(cxx_link_system_libraries targe +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxx/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxx/CMakeLists.txt +@@ -691,13 +691,16 @@ function(cxx_link_system_libraries targe endif() elseif (LIBCXX_HAS_GCC_LIB) target_link_libraries(${target} PRIVATE gcc) diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch index fa5d859c..8c352ac6 100644 --- a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch +++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch @@ -7,11 +7,11 @@ sure their ABI stays in sync. No known upstream bug about this. -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxxabi/src/cxa_exception.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.cpp -@@ -275,15 +275,16 @@ __cxa_throw(void *thrown_object, std::ty +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/cxa_exception.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.cpp +@@ -286,15 +286,16 @@ __cxa_throw(void *thrown_object, std::ty #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); @@ -30,7 +30,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx // 2.5.3 Exception Handlers /* The adjusted pointer is computed by the personality routine during phase 1 -@@ -567,7 +568,11 @@ void __cxa_end_catch() { +@@ -578,7 +579,11 @@ void __cxa_end_catch() { // to touch a foreign exception in any way, that is undefined // behavior. They likely can't since the only way to catch // a foreign exception is with catch (...)! @@ -42,7 +42,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx globals->caughtExceptions = 0; } } -@@ -624,8 +629,10 @@ void __cxa_rethrow() { +@@ -635,8 +640,10 @@ void __cxa_rethrow() { } #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); @@ -54,7 +54,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx #endif // If we get here, some kind of unwinding error has occurred. -@@ -749,8 +756,10 @@ __cxa_rethrow_primary_exception(void* th +@@ -760,8 +767,10 @@ __cxa_rethrow_primary_exception(void* th dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup; #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader); @@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx #endif // Some sort of unwinding error. Note that terminate is a handler. __cxa_begin_catch(&dep_exception_header->unwindHeader); -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.h =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxxabi/src/cxa_exception.h -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/cxa_exception.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.h @@ -27,6 +27,45 @@ _LIBCXXABI_HIDDEN uint64_t __getExceptio _LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint64_t); _LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); diff --git a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff index 9c4f834d..9cf70c68 100644 --- a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff +++ b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff @@ -1,10 +1,10 @@ if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library flags, otherwise add libgcc following how libunwind does the same -Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxxabi/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxxabi/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxxabi/src/CMakeLists.txt -@@ -77,7 +77,9 @@ else() +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/CMakeLists.txt +@@ -75,7 +75,9 @@ if (NOT APPLE) # On Apple platforms, we add_library_flags_if(LIBCXXABI_HAS_C_LIB c) endif() diff --git a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch index 7712e3a8..40a395c8 100644 --- a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch +++ b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch @@ -2,11 +2,11 @@ Powerpc has extended double that doesn't match x86 coding. Power format would need special tests to verify correctness but for now it is enough to prevent incorrect test from running. -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxxabi/test/test_demangle.pass.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/test/test_demangle.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxxabi/test/test_demangle.pass.cpp -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxxabi/test/test_demangle.pass.cpp -@@ -30163,7 +30163,7 @@ const char* invalid_cases[] = +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/test/test_demangle.pass.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/test/test_demangle.pass.cpp +@@ -30238,7 +30238,7 @@ const char* invalid_cases[] = "NSoERj5E=Y1[uM:ga", "Aon_PmKVPDk7?fg4XP5smMUL6;Vl<>IL8ayHpiVDDDXTY;^o9;i", "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_", diff --git a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch index cd822211..e8914201 100644 --- a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch +++ b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch @@ -12,11 +12,11 @@ which could then break something else. This probably should have upstream bug but I couldn't find any existing report. -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -@@ -33,6 +33,7 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +@@ -32,6 +32,7 @@ #include "lldb/Utility/StreamString.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/ScopedPrinter.h" @@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plug #include "ProcessGDBRemoteLog.h" -@@ -41,7 +42,7 @@ +@@ -40,7 +41,7 @@ #elif defined(_WIN32) #define DEBUGSERVER_BASENAME "lldb-server.exe" #else diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff index 3989a52c..908a7e5f 100644 --- a/debian/patches/lldb/lldb-soname.diff +++ b/debian/patches/lldb/lldb-soname.diff @@ -2,10 +2,10 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/CMakeLists.txt @@ -20,7 +20,12 @@ if(LLDB_ENABLE_LUA) set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp) endif() @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/ SBAddress.cpp SBAttachInfo.cpp SBBlock.cpp -@@ -164,7 +169,7 @@ endif() +@@ -169,7 +174,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/ ) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) -@@ -184,12 +189,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo +@@ -235,12 +240,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() diff --git a/debian/patches/lldb/print-lldb-path.patch b/debian/patches/lldb/print-lldb-path.patch index f325acd4..372d88fb 100644 --- a/debian/patches/lldb/print-lldb-path.patch +++ b/debian/patches/lldb/print-lldb-path.patch @@ -1,10 +1,10 @@ Author: Gianfranco Costamagna Last-Update: 2023-01-19 -Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/bindings/python/get-python-config.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/python/get-python-config.py =================================================================== ---- llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79.orig/lldb/bindings/python/get-python-config.py -+++ llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/bindings/python/get-python-config.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/bindings/python/get-python-config.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/python/get-python-config.py @@ -16,6 +16,7 @@ def relpath_nodots(path, base): @@ -34,11 +34,11 @@ Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/bindings/py except ValueError: # Try to fall back to something reasonable if sysconfig's platlib # is outside of sys.prefix -Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -+++ llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -@@ -240,6 +240,7 @@ void ScriptInterpreterPython::ComputePyt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +@@ -260,6 +260,7 @@ void ScriptInterpreterPython::ComputePyt // the real python interpreter uses. (e.g. lib for most, lib64 on RHEL // x86_64, or bin on Windows). llvm::sys::path::remove_filename(path); diff --git a/debian/patches/llvm-runtimes-builtins-build-check.diff b/debian/patches/llvm-runtimes-builtins-build-check.diff index eec769df..1e0c3bf7 100644 --- a/debian/patches/llvm-runtimes-builtins-build-check.diff +++ b/debian/patches/llvm-runtimes-builtins-build-check.diff @@ -1,10 +1,10 @@ add a check and only set up and build compiler-rt builtins if they have not been disabled -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt -@@ -129,7 +129,12 @@ endfunction() +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt +@@ -135,7 +135,12 @@ endfunction() # is required because the other runtimes need the builtin libraries present # before the just-built compiler can pass the configuration tests. get_compiler_rt_path(compiler_rt_path) diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index 1116fa9b..a778f721 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/CMakeLists.txt -@@ -843,8 +843,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt +@@ -877,8 +877,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH "Profiling data file to use when compiling in order to improve runtime performance.") if(LLVM_INCLUDE_TESTS) diff --git a/debian/patches/mips/mips-D101773-reloc.patch b/debian/patches/mips/mips-D101773-reloc.patch index ae99d678..15971c17 100644 --- a/debian/patches/mips/mips-D101773-reloc.patch +++ b/debian/patches/mips/mips-D101773-reloc.patch @@ -24,11 +24,11 @@ Differential Revision: https://reviews.llvm.org/D101773 2 files changed, 33 insertions(+) create mode 100644 llvm/test/MC/Mips/mips_lo16.s -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/MC/ELFObjectWriter.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/MC/ELFObjectWriter.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/MC/ELFObjectWriter.cpp -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/MC/ELFObjectWriter.cpp -@@ -1401,6 +1401,17 @@ bool ELFObjectWriter::shouldRelocateWith +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/MC/ELFObjectWriter.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/MC/ELFObjectWriter.cpp +@@ -1412,6 +1412,17 @@ bool ELFObjectWriter::shouldRelocateWith if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS && !hasRelocationAddend()) return true; diff --git a/debian/patches/mips/mips-force-nomadd4.patch b/debian/patches/mips/mips-force-nomadd4.patch index 208b226e..b91ca1d5 100644 --- a/debian/patches/mips/mips-force-nomadd4.patch +++ b/debian/patches/mips/mips-force-nomadd4.patch @@ -6,11 +6,11 @@ support both, we have to disabled those instructions. For that, the patch below basically corresponds to the --with-madd4=no used on the GCC side. -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Basic/Targets/Mips.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/Targets/Mips.h =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Basic/Targets/Mips.h -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Basic/Targets/Mips.h -@@ -331,6 +331,8 @@ public: +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Basic/Targets/Mips.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/Targets/Mips.h +@@ -334,6 +334,8 @@ public: HasMSA = true; else if (Feature == "+nomadd4") DisableMadd4 = true; diff --git a/debian/patches/omp-riscv64.patch b/debian/patches/omp-riscv64.patch index 760aedfd..9a31b8b2 100644 --- a/debian/patches/omp-riscv64.patch +++ b/debian/patches/omp-riscv64.patch @@ -1,11 +1,11 @@ Description: Define the affinity for riscv64 Last-Update: 2021-08-27 -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/kmp_affinity.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/kmp_affinity.h =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/src/kmp_affinity.h -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/kmp_affinity.h -@@ -212,6 +212,17 @@ public: +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/src/kmp_affinity.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/kmp_affinity.h +@@ -220,6 +220,17 @@ public: #elif __NR_sched_getaffinity != 123 #error Wrong code for getaffinity system call. #endif /* __NR_sched_getaffinity */ diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 1c44298e..8758042a 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -2,10 +2,10 @@ include required runtimes as dependencies to openmp targets to make sure they are built first when included as part of a runtimes build since openmp can depend on them <<<<<<< Updated upstream -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/llvm/runtimes/CM -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -513,7 +514,7 @@ if(runtimes) +@@ -517,7 +518,7 @@ if(runtimes) # build directory cannot find the C++ headers in certain configurations. # I need to build a mechanism for runtime projects to provide CMake code # that executes at LLVM configuration time to handle this case. @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/llvm/runtimes/CM # We need to add the runtimes as a dependency because compiler-rt can be # built as part of runtimes and we need the profile runtime for PGO add_dependencies(clang-bootstrap-deps runtimes) -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/CMakeLists.txt -@@ -111,6 +111,28 @@ else() +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/CMakeLists.txt +@@ -113,6 +113,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,11 +56,11 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/CMakeList # Build host runtime library, after LIBOMPTARGET variables are set since they are needed # to enable time profiling support in the OpenMP runtime. add_subdirectory(runtime) -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -@@ -71,6 +71,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +@@ -74,6 +74,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports") endif() @@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptar # Install plugin under the lib destination folder. install(TARGETS "omptarget.rtl.${tmachine_libname}" LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt @@ -80,6 +80,8 @@ else() " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() @@ -82,10 +82,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptar # Install plugin under the lib destination folder. install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") set_target_properties(omptarget.rtl.cuda PROPERTIES -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/libomptarget/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/libomptarget/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/src/CMakeLists.txt @@ -41,7 +41,9 @@ add_llvm_library(omptarget omp @@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptar target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt @@ -318,6 +318,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -112,10 +112,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/C # Shared library can be switched to a static library set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL "Shared library instead of static library?") -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/CMakeLists.txt @@ -144,6 +144,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -124,7 +124,7 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/s else() set(LIBOMP_LINKER_LANGUAGE CXX) endif() -@@ -205,6 +206,8 @@ else() +@@ -209,6 +210,8 @@ else() ) endif() @@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/s # Get the library's location within the build tree for the unit tester if(NOT WIN32) get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY) -Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/tools/archer/CMakeLists.txt @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER target_link_libraries(archer ${CMAKE_DL_LIBS}) add_library(archer_static STATIC ompt-tsan.cpp) diff --git a/debian/patches/openmp-soname.diff b/debian/patches/openmp-soname.diff index f3188bce..5631696c 100644 --- a/debian/patches/openmp-soname.diff +++ b/debian/patches/openmp-soname.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt -@@ -380,7 +380,8 @@ else() +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt +@@ -411,7 +411,8 @@ else() set(LIBOMP_INSTALL_KIND ARCHIVE) endif() diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 9affdf2a..1c878a50 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -2,11 +2,11 @@ clang/bindings/python/clang/cindex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/clang/cindex.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/bindings/python/clang/cindex.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/bindings/python/clang/cindex.py -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/clang/cindex.py -@@ -3937,7 +3937,7 @@ class Config(object): +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/bindings/python/clang/cindex.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/bindings/python/clang/cindex.py +@@ -3980,7 +3980,7 @@ class Config: elif name == "Windows": file = "libclang.dll" else: diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff index 6548700c..982fa7cf 100644 --- a/debian/patches/remove-apple-clang-manpage.diff +++ b/debian/patches/remove-apple-clang-manpage.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/CommandGuide/clang.rst +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/CommandGuide/clang.rst =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/CommandGuide/clang.rst -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/CommandGuide/clang.rst -@@ -353,24 +353,10 @@ Clang fully supports cross compilation a +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/CommandGuide/clang.rst ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/CommandGuide/clang.rst +@@ -354,24 +354,10 @@ Clang fully supports cross compilation a Depending on how your version of Clang is configured, it may have support for a number of cross compilers, or may only support a native target. @@ -27,7 +27,7 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/Comma .. option:: --print-supported-cpus Print out a list of supported processors for the given target (specified -@@ -705,11 +691,6 @@ ENVIRONMENT +@@ -721,11 +707,6 @@ ENVIRONMENT These environment variables specify additional paths, as for :envvar:`CPATH`, which are only used when processing the appropriate language. diff --git a/debian/patches/revert-update-doc.diff b/debian/patches/revert-update-doc.diff index 78cb249f..bd8e55b8 100644 --- a/debian/patches/revert-update-doc.diff +++ b/debian/patches/revert-update-doc.diff @@ -15,10 +15,10 @@ Date: Tue Feb 1 23:13:01 2022 -0800 Differential Revision: https://reviews.llvm.org/D112181 -Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py @@ -44,6 +44,15 @@ master_doc = "index" project = "Extra Clang Tools" copyright = "2007-%d, The Clang Team" % date.today().year @@ -47,11 +47,11 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extr # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf.py -@@ -63,6 +63,15 @@ master_doc = "index" +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +@@ -48,6 +48,15 @@ master_doc = "index" project = "Clang" copyright = "2007-%d, The Clang Team" % date.today().year @@ -67,7 +67,7 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf. # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -@@ -94,11 +103,6 @@ exclude_patterns = ["_build"] +@@ -79,11 +88,6 @@ exclude_patterns = ["_build"] # The name of the Pygments (syntax highlighting) style to use. pygments_style = "friendly" @@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf. # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lld/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lld/docs/conf.py -+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lld/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lld/docs/conf.py @@ -43,6 +43,15 @@ master_doc = "index" project = "lld" copyright = "2011-%d, LLVM Project" % date.today().year @@ -99,10 +99,10 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/docs/conf.py # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/cmake/modules/AddSphinxTarget.cmake +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/cmake/modules/AddSphinxTarget.cmake =================================================================== ---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/cmake/modules/AddSphinxTarget.cmake -+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/cmake/modules/AddSphinxTarget.cmake +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/cmake/modules/AddSphinxTarget.cmake ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/cmake/modules/AddSphinxTarget.cmake @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") endif() @@ -124,11 +124,11 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/cmake/modul ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested "${ARG_SOURCE_DIR}" # Source "${SPHINX_BUILD_DIR}" # Output -Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/docs/conf.py -+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/docs/conf.py -@@ -62,6 +62,15 @@ master_doc = "index" +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/conf.py +@@ -52,6 +52,15 @@ master_doc = "index" project = "LLVM" copyright = "2003-%d, LLVM Project" % date.today().year @@ -144,10 +144,10 @@ Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/docs/conf.p # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/polly/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/polly/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py @@ -44,6 +44,15 @@ master_doc = "index" project = "Polly" copyright = "2010-%d, The Polly Team" % date.today().year diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index b985062f..1d4012cc 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -2,11 +2,11 @@ clang/tools/scan-build/bin/scan-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan-build/bin/scan-build +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-build/bin/scan-build =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/tools/scan-build/bin/scan-build -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan-build/bin/scan-build -@@ -1485,7 +1485,7 @@ sub FindClang { +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/scan-build/bin/scan-build ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-build/bin/scan-build +@@ -1494,7 +1494,7 @@ sub FindClang { if (!defined $Options{AnalyzerDiscoveryMethod}) { $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); if (!defined $Clang || ! -x $Clang) { diff --git a/debian/patches/scan-view-fix-path.diff b/debian/patches/scan-view-fix-path.diff index 71284d03..420073b5 100644 --- a/debian/patches/scan-view-fix-path.diff +++ b/debian/patches/scan-view-fix-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/scan-view/bin/scan-view -@@ -65,7 +65,7 @@ def start_browser(port, options): +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/scan-view/bin/scan-view +@@ -64,7 +64,7 @@ def start_browser(port, options): def run(port, options, root): # Prefer to look relative to the installed binary diff --git a/debian/patches/silent-gold-utils.diff b/debian/patches/silent-gold-utils.diff index 69bb1a4d..5344eb09 100644 --- a/debian/patches/silent-gold-utils.diff +++ b/debian/patches/silent-gold-utils.diff @@ -15,10 +15,10 @@ test/tools/gold/X86/visibility.ll | 1 + 14 files changed, 19 insertions(+), 2 deletions(-) -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/common_thinlto.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/common_thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/common_thinlto.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/common_thinlto.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/common_thinlto.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/common_thinlto.ll @@ -17,6 +17,7 @@ ; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM @@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ source_filename = "common1.c" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/emit-llvm.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/emit-llvm.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/emit-llvm.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/emit-llvm.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/emit-llvm.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/emit-llvm.ll @@ -21,6 +21,8 @@ ; RUN: not test -a %t4.o @@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/parallel.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/parallel.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/parallel.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/parallel.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/parallel.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/parallel.ll @@ -5,6 +5,7 @@ ; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s ; RUN: llvm-nm %t.lto.o | FileCheck --check-prefix=CHECK0 %s @@ -52,10 +52,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/pr19901_thinlto.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/pr19901_thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/pr19901_thinlto.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/pr19901_thinlto.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/pr19901_thinlto.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/pr19901_thinlto.ll @@ -4,6 +4,7 @@ ; RUN: --plugin-opt=thinlto \ ; RUN: -shared -m elf_x86_64 -o %t.so %t2.o %t.o @@ -64,10 +64,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ ; CHECK: Symbol { ; CHECK: Name: f -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/slp-vectorize.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/slp-vectorize.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/slp-vectorize.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/slp-vectorize.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/slp-vectorize.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/slp-vectorize.ll @@ -6,6 +6,7 @@ ; test that the vectorizer is run. @@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/strip_names.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/strip_names.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/strip_names.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/strip_names.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/strip_names.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/strip_names.ll @@ -25,6 +25,7 @@ ; NONAME: %2 = load i32, ptr @GlobalValueName ; NONAME: %3 = add i32 %0, %2 @@ -88,11 +88,11 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto.ll -@@ -148,6 +148,8 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto.ll +@@ -145,6 +145,8 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" @@ -101,10 +101,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ declare void @g(...) define void @f() { -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_archive.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_archive.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto_archive.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_archive.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto_archive.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_archive.ll @@ -15,6 +15,7 @@ ; RUN: --plugin-opt=jobs=1 \ ; RUN: -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s @@ -113,10 +113,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_internalize.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_internalize.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto_internalize.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_internalize.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto_internalize.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_internalize.ll @@ -14,6 +14,8 @@ ; h() should be internalized after promotion, and eliminated after inlining ; CHECK-NOT: @h.llvm. @@ -126,10 +126,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" define i32 @g() { -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll @@ -23,6 +23,8 @@ ; OPT-NOT: @f() ; OPT2: define weak_odr hidden void @f() @@ -139,10 +139,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" define i32 @g() { -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll @@ -9,6 +9,7 @@ ; RUN: --plugin-opt=save-temps \ ; RUN: -shared \ @@ -151,10 +151,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ ; RUN: llvm-nm %t3.o | FileCheck %s ; CHECK: weakfunc -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/type-merge2.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/type-merge2.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/type-merge2.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/type-merge2.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/type-merge2.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/type-merge2.ll @@ -6,6 +6,8 @@ ; RUN: -shared %t.o %t2.o -o %t3.o ; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s @@ -164,10 +164,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/vectorize.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/vectorize.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/vectorize.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/vectorize.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/vectorize.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/vectorize.ll @@ -6,6 +6,7 @@ ; test that the vectorizer is run. @@ -176,10 +176,10 @@ Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -Index: llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/visibility.ll +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/visibility.ll =================================================================== ---- llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a.orig/llvm/test/tools/gold/X86/visibility.ll -+++ llvm-toolchain-snapshot_15~++20220602015647+53efdf33f85a/llvm/test/tools/gold/X86/visibility.ll +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/test/tools/gold/X86/visibility.ll ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/test/tools/gold/X86/visibility.ll @@ -16,6 +16,7 @@ ; CHECK-NEXT: Other [ ; CHECK-NEXT: STV_PROTECTED diff --git a/debian/patches/symbolizer-path.diff b/debian/patches/symbolizer-path.diff index d94593d3..4ed4338b 100644 --- a/debian/patches/symbolizer-path.diff +++ b/debian/patches/symbolizer-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp -+++ llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp -@@ -33,6 +33,11 @@ +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +@@ -34,6 +34,11 @@ # include "sanitizer_symbolizer_libbacktrace.h" # include "sanitizer_symbolizer_mac.h" @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/ // C++ demangling function, as required by Itanium C++ ABI. This is weak, // because we do not require a C++ ABI library to be linked to a program // using sanitizers; if it's not present, we'll just use the mangled name. -@@ -451,7 +456,7 @@ static SymbolizerTool *ChooseExternalSym +@@ -450,7 +455,7 @@ static SymbolizerTool *ChooseExternalSym return new(*allocator) AtosSymbolizer(found_path, allocator); } #endif // SANITIZER_APPLE @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/ VReport(2, "Using llvm-symbolizer found at: %s\n", found_path); return new(*allocator) LLVMSymbolizer(found_path, allocator); } -Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/CMakeLists.txt -@@ -203,6 +203,7 @@ set(SANITIZER_IMPL_HEADERS +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/CMakeLists.txt +@@ -214,6 +214,7 @@ set(SANITIZER_IMPL_HEADERS ) include_directories(..) diff --git a/debian/patches/unbreak-atomic-mips.diff b/debian/patches/unbreak-atomic-mips.diff index 9b251453..a998444d 100644 --- a/debian/patches/unbreak-atomic-mips.diff +++ b/debian/patches/unbreak-atomic-mips.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/scudo/standalone/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/scudo/standalone/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/scudo/standalone/CMakeLists.txt -@@ -178,6 +178,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/scudo/standalone/CMakeLists.txt +@@ -194,6 +194,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH list(APPEND SCUDO_LINK_LIBS atomic) endif() diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff index 4918aaec..92c12a70 100644 --- a/debian/patches/unwind-chain-inclusion.diff +++ b/debian/patches/unwind-chain-inclusion.diff @@ -8,10 +8,10 @@ clang/lib/Headers/unwind.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/unwind.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Headers/unwind.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Headers/unwind.h -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/unwind.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Headers/unwind.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Headers/unwind.h @@ -9,9 +9,6 @@ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ @@ -32,7 +32,7 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Header #include #ifdef __cplusplus -@@ -323,6 +323,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc +@@ -327,6 +327,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc } #endif diff --git a/debian/patches/unwind-force-pthread-dl.diff b/debian/patches/unwind-force-pthread-dl.diff index 08111df4..89896032 100644 --- a/debian/patches/unwind-force-pthread-dl.diff +++ b/debian/patches/unwind-force-pthread-dl.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libunwind/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libunwind/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libunwind/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libunwind/CMakeLists.txt -@@ -277,14 +277,17 @@ if (MSVC) +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libunwind/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libunwind/CMakeLists.txt +@@ -301,14 +301,17 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() diff --git a/debian/patches/wasm/wasm-compiler-rt-default.diff b/debian/patches/wasm/wasm-compiler-rt-default.diff index 351fcc79..70ce1aa6 100644 --- a/debian/patches/wasm/wasm-compiler-rt-default.diff +++ b/debian/patches/wasm/wasm-compiler-rt-default.diff @@ -1,6 +1,8 @@ ---- a/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp -@@ -369,6 +369,18 @@ ToolChain::RuntimeLibType WebAssembly::G +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -393,6 +393,18 @@ ToolChain::RuntimeLibType WebAssembly::G return ToolChain::RLT_CompilerRT; } @@ -19,9 +21,11 @@ ToolChain::CXXStdlibType WebAssembly::GetCXXStdlibType(const ArgList &Args) const { if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) { ---- a/clang/lib/Driver/ToolChains/WebAssembly.h -+++ b/clang/lib/Driver/ToolChains/WebAssembly.h -@@ -61,6 +61,7 @@ private: +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +=================================================================== +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +@@ -60,6 +60,7 @@ private: llvm::opt::ArgStringList &CC1Args, Action::OffloadKind DeviceOffloadKind) const override; RuntimeLibType GetDefaultRuntimeLibType() const override; diff --git a/debian/patches/wasm/wasm-ld-path.diff b/debian/patches/wasm/wasm-ld-path.diff index 41789182..5617766b 100644 --- a/debian/patches/wasm/wasm-ld-path.diff +++ b/debian/patches/wasm/wasm-ld-path.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/lib/Driver/ToolChains/WebAssembly.h +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h @@ -10,9 +10,13 @@ #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_WEBASSEMBLY_H @@ -16,7 +16,7 @@ Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/lib/Driver namespace clang { namespace driver { namespace tools { -@@ -68,7 +72,7 @@ private: +@@ -67,7 +71,7 @@ private: llvm::opt::ArgStringList &CmdArgs) const override; SanitizerMask getSupportedSanitizers() const override; diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff index b3bbf565..592946a3 100644 --- a/debian/patches/wasm/wasm-sysroot-usr.diff +++ b/debian/patches/wasm/wasm-sysroot-usr.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp -@@ -174,7 +174,7 @@ WebAssembly::WebAssembly(const Driver &D +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -200,7 +200,7 @@ WebAssembly::WebAssembly(const Driver &D getProgramPaths().push_back(getDriver().getInstalledDir()); @@ -11,7 +11,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp if (getTriple().getOS() == llvm::Triple::UnknownOS) { // Theoretically an "unknown" OS should mean no standard libraries, however // it could also mean that a custom set of libraries is in use, so just add -@@ -402,6 +402,7 @@ void WebAssembly::AddClangSystemIncludeA +@@ -426,6 +426,7 @@ void WebAssembly::AddClangSystemIncludeA return; const Driver &D = getDriver(); @@ -19,7 +19,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { SmallString<128> P(D.ResourceDir); -@@ -425,12 +426,20 @@ void WebAssembly::AddClangSystemIncludeA +@@ -449,12 +450,20 @@ void WebAssembly::AddClangSystemIncludeA return; } @@ -43,7 +43,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp } void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, -@@ -478,6 +487,17 @@ Tool *WebAssembly::buildLinker() const { +@@ -505,6 +514,17 @@ Tool *WebAssembly::buildLinker() const { return new tools::wasm::Linker(*this); } @@ -61,7 +61,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp void WebAssembly::addLibCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { -@@ -488,18 +508,22 @@ void WebAssembly::addLibCxxIncludePaths( +@@ -515,18 +535,22 @@ void WebAssembly::addLibCxxIncludePaths( getMultiarchTriple(D, getTriple(), SysRoot); bool IsKnownOs = (getTriple().getOS() != llvm::Triple::UnknownOS); @@ -91,7 +91,7 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp } void WebAssembly::addLibStdCXXIncludePaths( -@@ -546,8 +570,11 @@ void WebAssembly::addLibStdCXXIncludePat +@@ -573,8 +597,11 @@ void WebAssembly::addLibStdCXXIncludePat addSystemInclude(DriverArgs, CC1Args, TargetDir); } @@ -107,11 +107,11 @@ Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp + addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward"); + } } -Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== ---- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.h -@@ -89,6 +89,8 @@ private: +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +@@ -88,6 +88,8 @@ private: llvm::opt::ArgStringList &CC1Args) const; void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const; From 4e4ef90e8d0776c9d0b897416eb052e06d77e5b1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 21 Feb 2024 10:43:08 +0100 Subject: [PATCH 012/241] adjust the filename with the recent naming change --- debian/libclang-cppX.Y.install.in | 2 +- debian/libllvmX.Y.install.in | 2 +- debian/libomp5-X.Y.install.in | 2 +- debian/llvm-X.Y-linker-tools.install.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Y.install.in index b0d88e0e..5874c10d 100644 --- a/debian/libclang-cppX.Y.install.in +++ b/debian/libclang-cppX.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.0 diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index f8d968f8..c5215640 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Y.install.in index 8204faac..a0fcf107 100644 --- a/debian/libomp5-X.Y.install.in +++ b/debian/libomp5-X.Y.install.in @@ -1,4 +1,4 @@ #!/usr/bin/dh-exec usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5 -[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@ +[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.0 diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in index 3aeaab5c..a073ccab 100644 --- a/debian/llvm-X.Y-linker-tools.install.in +++ b/debian/llvm-X.Y-linker-tools.install.in @@ -1,4 +1,4 @@ #!/usr/bin/dh-exec -usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.0 [!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so From a01f7104e6092376dafdbe988889c7ef15fda796 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 22 Feb 2024 12:23:00 +0100 Subject: [PATCH 013/241] Also install usr/lib/llvm-19/lib/libLLVM.so.1 and usr/lib/llvm-19/lib/libLLVM.so.19.0 --- debian/changelog | 2 ++ debian/libllvmX.Y.install.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index dee2baf7..fcf5fbe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp2) UNRELEASED; [ Sylvestre Ledru ] * hwasan_symbolize is now built also on i386 * Update of the libomp symbols + * Also install usr/lib/llvm-19/lib/libLLVM.so.1 + and usr/lib/llvm-19/lib/libLLVM.so.19.0 [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index c5215640..3ecdb223 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1 +1,3 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.0 From 636a3ead980b48b2afe4a50b8a19c47f23b99413 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 22 Feb 2024 12:25:53 +0100 Subject: [PATCH 014/241] Install clang-installapi as part of clang-tools --- debian/changelog | 1 + debian/clang-tools-X.Y.install.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index fcf5fbe7..406eb6aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp2) UNRELEASED; * Update of the libomp symbols * Also install usr/lib/llvm-19/lib/libLLVM.so.1 and usr/lib/llvm-19/lib/libLLVM.so.19.0 + * Install clang-installapi as part of clang-tools [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 1394605f..667657b6 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -38,6 +38,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-tblgen usr/lib/llvm-@LLVM_VERSION@/bin/clang-include-cleaner usr/lib/llvm-@LLVM_VERSION@/bin/amdgpu-arch usr/lib/llvm-@LLVM_VERSION@/bin/nvptx-arch +usr/lib/llvm-@LLVM_VERSION@/bin/clang-installapi usr/lib/llvm-@LLVM_VERSION@/bin/analyze-build usr/lib/llvm-@LLVM_VERSION@/bin/intercept-build @@ -105,3 +106,4 @@ usr/bin/clang-tblgen-@LLVM_VERSION@ usr/bin/clang-include-cleaner-@LLVM_VERSION@ usr/bin/amdgpu-arch-@LLVM_VERSION@ usr/bin/nvptx-arch-@LLVM_VERSION@ +usr/bin/clang-installapi-@LLVM_VERSION@ From de649b0b1303c16060c85d74749effcf4e6b87ad Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 26 Feb 2024 21:56:29 +0100 Subject: [PATCH 015/241] rebase of all patches --- debian/patches/0044-soname.diff | 16 ++++++++-------- .../disable-display-PASS-UNSUPPORTED-XFAIL.diff | 17 ----------------- debian/patches/series | 1 - 3 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 42c0d66f..4e16271b 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -3,10 +3,10 @@ tools/llvm-shlib/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240226095317+113052b2b022.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/clang/tools/libclang/CMakeLists.txt @@ -135,7 +135,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,13 +16,13 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/tools/llvm-shlib/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240226095317+113052b2b022.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/llvm/tools/llvm-shlib/CMakeLists.txt @@ -38,6 +38,8 @@ if(LLVM_BUILD_LLVM_DYLIB) - get_target_property(LLVM_DYLIB_FILENAME LLVM OUTPUT_NAME) - llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} ${LLVM_DYLIB_FILENAME} SHARED COMPONENT LLVM) + get_target_property(LLVM_DYLIB_SOVERSION LLVM SOVERSION) + llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} LLVM SHARED COMPONENT LLVM SOVERSION ${LLVM_DYLIB_SOVERSION}) + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + diff --git a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff deleted file mode 100644 index 71669df2..00000000 --- a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/third_party/Python/module/unittest2/unittest2/runner.py -=================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/lldb/third_party/Python/module/unittest2/unittest2/runner.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/third_party/Python/module/unittest2/unittest2/runner.py -@@ -174,9 +174,9 @@ class TextTestRunner(unittest.TextTestRu - if hasattr(result, 'separator2'): - self.stream.writeln(result.separator2) - run = result.testsRun -- self.stream.writeln("Ran %d test%s in %.3fs" % -- (run, run != 1 and "s" or "", timeTaken)) -- self.stream.writeln() -+# self.stream.writeln("Ran %d test%s in %.3fs" % -+# (run, run != 1 and "s" or "", timeTaken)) -+# self.stream.writeln() - - expectedFails = unexpectedSuccesses = skipped = passed = failed = errored = 0 - try: diff --git a/debian/patches/series b/debian/patches/series index 170f00de..d791d81e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,7 +21,6 @@ debug-jit-path.diff #force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff -disable-display-PASS-UNSUPPORTED-XFAIL.diff # Lib names 0044-soname.diff From 4005c9f4d432d69ee159be04209c072477b1852f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 28 Feb 2024 11:06:32 +0100 Subject: [PATCH 016/241] rebase of all patches --- ...cxxabi-test-don-t-fail-extended-long-double.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch index 40a395c8..02f5b1eb 100644 --- a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch +++ b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch @@ -2,14 +2,14 @@ Powerpc has extended double that doesn't match x86 coding. Power format would need special tests to verify correctness but for now it is enough to prevent incorrect test from running. -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/test/test_demangle.pass.cpp +Index: llvm-toolchain-snapshot_19~++20240228110413+ba692301f169/libcxxabi/test/test_demangle.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/test/test_demangle.pass.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/test/test_demangle.pass.cpp -@@ -30238,7 +30238,7 @@ const char* invalid_cases[] = - "NSoERj5E=Y1[uM:ga", - "Aon_PmKVPDk7?fg4XP5smMUL6;Vl<>IL8ayHpiVDDDXTY;^o9;i", +--- llvm-toolchain-snapshot_19~++20240228110413+ba692301f169.orig/libcxxabi/test/test_demangle.pass.cpp ++++ llvm-toolchain-snapshot_19~++20240228110413+ba692301f169/libcxxabi/test/test_demangle.pass.cpp +@@ -30239,7 +30239,7 @@ const char* invalid_cases[] = "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_", + "3FooILdaaaaaaaaaaAAAAaaEE", + "3FooILdaaaaaaaaaaaaaaEE", -#if !LDBL_FP80 +#if !LDBL_FP80 && __LDBL_MANT_DIG__ < 64 "_ZN5test01hIfEEvRAcvjplstT_Le4001a000000000000000E_c", From ba5358deed22b5f2cd54d43dce033baab69b3e28 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 1 Mar 2024 13:58:07 +0100 Subject: [PATCH 017/241] Disable the install of libomp in sub arch Following 1977404d20ab29ff78a58d8c0f1f4c5e7aef6b16 --- debian/changelog | 2 ++ debian/rules | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 406eb6aa..61830d6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp2) UNRELEASED; * Also install usr/lib/llvm-19/lib/libLLVM.so.1 and usr/lib/llvm-19/lib/libLLVM.so.19.0 * Install clang-installapi as part of clang-tools + * Disable the install of libomp in sub arch + Following 1977404d20ab29ff78a58d8c0f1f4c5e7aef6b16 [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 diff --git a/debian/rules b/debian/rules index a5820140..e6c1393d 100755 --- a/debian/rules +++ b/debian/rules @@ -786,6 +786,7 @@ endif -DLIBOMP_ENABLE_RTTI=OFF \ -DLIBOMP_OMPT_SUPPORT=OFF \ -DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=ON \ + -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ $(CMAKE_EXTRA) \ -DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ -DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ From bd88e28e5a4e3dede51faadd9daef816d444528b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 1 Mar 2024 13:58:07 +0100 Subject: [PATCH 018/241] Disable the install of libomp in sub arch Following 1977404d20ab29ff78a58d8c0f1f4c5e7aef6b16 --- debian/patches/disable-openmp-per-target.diff | 23 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 24 insertions(+) create mode 100644 debian/patches/disable-openmp-per-target.diff diff --git a/debian/patches/disable-openmp-per-target.diff b/debian/patches/disable-openmp-per-target.diff new file mode 100644 index 00000000..d672e41d --- /dev/null +++ b/debian/patches/disable-openmp-per-target.diff @@ -0,0 +1,23 @@ +Index: llvm-toolchain-snapshot_19~++20240229092005+22f5e30c1798/openmp/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot_19~++20240229092005+22f5e30c1798.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240229092005+22f5e30c1798/openmp/CMakeLists.txt +@@ -48,13 +48,13 @@ else() + set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) + + # When building in tree we install the runtime according to the LLVM settings. +- if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +- set(OPENMP_INSTALL_LIBDIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING +- "Path where built openmp libraries should be installed.") +- else() ++# if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) ++# set(OPENMP_INSTALL_LIBDIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING ++# "Path where built openmp libraries should be installed.") ++# else() + set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}" CACHE STRING + "Path where built OpenMP libraries should be installed.") +- endif() ++# endif() + + if (NOT MSVC) + set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) diff --git a/debian/patches/series b/debian/patches/series index d791d81e..053d7b9c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -148,3 +148,4 @@ libclang-major-version-only.diff D148945-revert.diff arm32-defaults.diff mips/D154390-pre-R6.diff +disable-openmp-per-target.diff From d9946eabf00eef3f1ba21dcc55abe4ba9e8f9701 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Mar 2024 11:48:36 +0100 Subject: [PATCH 019/241] rebase of the patch --- debian/patches/openmp-fix-runtimes-build.diff | 65 +++++++++---------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 8758042a..1fb7300d 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_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CM -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -517,7 +518,7 @@ if(runtimes) +@@ -522,7 +523,7 @@ if(runtimes) # build directory cannot find the C++ headers in certain configurations. # I need to build a mechanism for runtime projects to provide CMake code # that executes at LLVM configuration time to handle this case. @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/CMakeLists.txt -@@ -113,6 +113,28 @@ else() +--- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/CMakeLists.txt +@@ -119,6 +119,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,11 +56,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/plugins-nextgen/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -@@ -74,6 +74,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma +--- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +@@ -75,6 +75,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports") endif() @@ -69,11 +69,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptar # Install plugin under the lib destination folder. install(TARGETS "omptarget.rtl.${tmachine_libname}" LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -@@ -80,6 +80,8 @@ else() +--- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +@@ -81,6 +81,8 @@ else() " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() @@ -82,25 +82,24 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/openmp/libomptarget/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/libomptarget/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/libomptarget/src/CMakeLists.txt -@@ -41,7 +41,9 @@ add_llvm_library(omptarget - omp - +--- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/libomptarget/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/src/CMakeLists.txt +@@ -43,6 +43,9 @@ add_llvm_library(omptarget NO_INSTALL_RPATH --) -+ ) + BUILDTREE_ONLY + ) ++ +add_runtimes_build_depends_if_needed(omptarget) + target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/runtime/CMakeLists.txt @@ -318,6 +318,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -112,10 +111,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/runtime/src/CMakeLists.txt @@ -144,6 +144,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -133,10 +132,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/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_19~++20240220124703+f122268c0441/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/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) From e07b70ce718307b328b9b2079f7bd9e9609d6ae7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Mar 2024 18:33:34 +0100 Subject: [PATCH 020/241] fix changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 61830d6b..e8e63525 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] * hwasan_symbolize is now built also on i386 From bb17074e3c4cd02dd6708ef3dfb499960abdc0e0 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Feb 2024 09:20:50 +0100 Subject: [PATCH 021/241] Revert: Try gold linker on mips64el --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index e6c1393d..bbccb144 100755 --- a/debian/rules +++ b/debian/rules @@ -299,7 +299,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV) endif -BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips64el +BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0) ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold From 26c93c9ff75a299c89acf0317ee72b224785567b Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Feb 2024 14:10:45 +0100 Subject: [PATCH 022/241] Add code to hack time64 in 32bit builds, and try to disable stack protector on mips64el --- debian/changelog | 15 ++++++++++----- debian/control | 14 +++++++++----- debian/control.in | 14 +++++++++----- debian/rules | 41 +++++++++++++++++++++++++++-------------- 4 files changed, 55 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8e63525..aee48d62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:19~++20240302063716+a30ba2ca21b0-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + + -- Sylvestre Ledru Sat, 02 Mar 2024 18:37:29 +0100 + llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] @@ -26,13 +32,12 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental -- Sylvestre Ledru Thu, 25 Jan 2024 14:51:10 +0100 -llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium - [ John Paul Adrian Glaubitz ] - * Install *clang_rt* on sparc and sparc64 - * Run chrpath for libclang on sparc and sparc64 + * Fix 32bit builds, exclude i386, don't build clang-rt there + * Revert gold linker on mips64el - -- John Paul Adrian Glaubitz Fri, 16 Feb 2024 09:53:15 +0100 + -- Gianfranco Costamagna Fri, 09 Feb 2024 20:59:07 +0100 llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 63c87b03..9d71ef75 100644 --- a/debian/control +++ b/debian/control @@ -135,6 +135,7 @@ Description: C, C++ and Objective-C compiler - Documentation This package contains the documentation. Package: libclang1-19 +Provides: ${t64:Provides} Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -236,6 +237,7 @@ Description: High-level loop and data-locality optimizer # ------------- clang libraries ------------- Package: libclang-cpp19 +Provides: ${t64:Provides} Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) @@ -338,6 +340,7 @@ Description: Clang examples # ------------- LLVM ------------- Package: libllvm19 +Provides: ${t64:Provides} Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -570,6 +573,7 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: liblldb-19 +Provides: ${t64:Provides} Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) @@ -634,7 +638,7 @@ Package: libomp5-19 Multi-Arch: same Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libomp-x.y +Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y Replaces: libomp-x.y Description: LLVM OpenMP runtime @@ -665,7 +669,7 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: clang -Provides: libc++-x.y +Provides: ${t64:Provides}, libc++-x.y Conflicts: libc++-x.y Replaces: libc++-x.y Description: LLVM C++ Standard library @@ -735,7 +739,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libc++abi-x.y +Provides: ${t64:Provides}, libc++abi-x.y Conflicts: libc++abi-x.y Replaces: libc++abi-x.y Description: LLVM low level support for a standard C++ library @@ -829,7 +833,7 @@ Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libunwind-x.y +Provides: ${t64:Provides}, libunwind-x.y Conflicts: libunwind-x.y Replaces: libunwind-x.y Description: production-quality unwinder @@ -877,7 +881,7 @@ Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libmlir-x.y +Provides: ${t64:Provides}, libmlir-x.y Conflicts: libmlir-x.y Replaces: libmlir-x.y Description: Multi-Level Intermediate Representation library diff --git a/debian/control.in b/debian/control.in index d47e0cc4..94402b28 100644 --- a/debian/control.in +++ b/debian/control.in @@ -135,6 +135,7 @@ Description: C, C++ and Objective-C compiler - Documentation This package contains the documentation. Package: libclang1-@LLVM_VERSION@ +Provides: ${t64:Provides} Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -236,6 +237,7 @@ Description: High-level loop and data-locality optimizer # ------------- clang libraries ------------- Package: libclang-cpp@LLVM_VERSION@ +Provides: ${t64:Provides} Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) @@ -338,6 +340,7 @@ Description: Clang examples # ------------- LLVM ------------- Package: libllvm@LLVM_VERSION@ +Provides: ${t64:Provides} Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -570,6 +573,7 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: liblldb-@LLVM_VERSION@ +Provides: ${t64:Provides} Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) @@ -634,7 +638,7 @@ Package: libomp5-@LLVM_VERSION@ Multi-Arch: same Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libomp-x.y +Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y Replaces: libomp-x.y Description: LLVM OpenMP runtime @@ -665,7 +669,7 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: clang -Provides: libc++-x.y +Provides: ${t64:Provides}, libc++-x.y Conflicts: libc++-x.y Replaces: libc++-x.y Description: LLVM C++ Standard library @@ -735,7 +739,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libc++abi-x.y +Provides: ${t64:Provides}, libc++abi-x.y Conflicts: libc++abi-x.y Replaces: libc++abi-x.y Description: LLVM low level support for a standard C++ library @@ -829,7 +833,7 @@ Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libunwind-x.y +Provides: ${t64:Provides}, libunwind-x.y Conflicts: libunwind-x.y Replaces: libunwind-x.y Description: production-quality unwinder @@ -877,7 +881,7 @@ Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libmlir-x.y +Provides: ${t64:Provides}, libmlir-x.y Conflicts: libmlir-x.y Replaces: libmlir-x.y Description: Multi-Level Intermediate Representation library diff --git a/debian/rules b/debian/rules index bbccb144..22670fc1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,6 @@ # polly & lldb aren't enabled for every platform PROJECTS = clang;clang-tools-extra;lld;cross-project-tests;mlir # openmp & libunwind aren't enabled for every platform -RUNTIMES = compiler-rt;libcxx;libcxxabi TARGET_BUILD := build-llvm TARGET_BUILD_STAGE2 := $(TARGET_BUILD)/tools/clang/stage2-bins @@ -22,6 +21,27 @@ ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL)) endif LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$NF+=1; print}') +# dpkg-buildflags support +# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto +# remove +time64,+lfs once the time64_t transition starts +ifeq ($(DEB_HOST_ARCH),i386) + RUNTIMES = compiler-rt;libcxx;libcxxabi + export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto +else + ifeq ($(DEB_HOST_ARCH_BITS),32) + RUNTIMES = libcxx;libcxxabi + export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto abi=+time64,+lfs + skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev + else + RUNTIMES = compiler-rt;libcxx;libcxxabi + ifeq ($(DEB_HOST_ARCH),mips64el) + export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong + else + export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto + endif + endif +endif + SOURCE_NAME := $(shell dpkg-parsechangelog -S Source) ifneq (,$(findstring snapshot,$(SOURCE_NAME))) BRANCH_NAME=snapshot @@ -63,16 +83,6 @@ include /usr/share/dpkg/architecture.mk CONFIGURE_EXTRA = -# dpkg-buildflags support -# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto -# remove +time64,+lfs once the time64_t transition starts -export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto - -ifeq ($(DEB_BUILD_ARCH_BITS),64) - export DEB_BUILD_MAINT_OPTIONS += abi=+time64,+lfs -endif - - # these are handled on a per stage / build basis ifeq ($(VENDOR)-$(DEB_HOST_ARCH),Ubuntu-ppc64el) export DEB_CFLAGS_MAINT_STRIP = -g -O3 @@ -1136,7 +1146,7 @@ override_dh_auto_install: ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe)) ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux)) # To fix custom-library-search-path - chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so + chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so || true endif endif @@ -1398,7 +1408,7 @@ else rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake endif endif - dh_install --fail-missing + dh_install --fail-missing ${skip_packages} # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages # These packages are arch: all, so only do so when the packages are built ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(packages))) @@ -1526,8 +1536,11 @@ override_dh_auto_test: endif +override_dh_builddeb: + dh_builddeb ${skip_packages} + override_dh_gencontrol: stamps/sccache-stats - dh_gencontrol -- $(control_vars) + dh_gencontrol ${skip_packages} -- $(control_vars) override_dh_auto_clean: From 7fb872cba861635ecb99665cf5b1d3d006adc68b Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Feb 2024 14:11:36 +0100 Subject: [PATCH 023/241] Update changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index aee48d62..1bb8986a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el + * Disable stack protector on mips64el -- Gianfranco Costamagna Fri, 09 Feb 2024 20:59:07 +0100 From fb514a6547c799bdd81bf7ab2edc3725a2650900 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 18 Feb 2024 22:34:01 +0100 Subject: [PATCH 024/241] add -DLIBCXX_INSTALL_MODULES=ON see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 22670fc1..0a7c37ff 100755 --- a/debian/rules +++ b/debian/rules @@ -791,6 +791,7 @@ endif -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \ -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \ -DLIBCXX_INSTALL_LIBRARY=OFF \ + -DLIBCXX_INSTALL_MODULES=ON \ -DOPENMP_ENABLE_LIBOMP_PROFILING=OFF \ -DOPENMP_ENABLE_LIBOMPTARGET_PROFILING=OFF \ -DLIBOMP_ENABLE_RTTI=OFF \ From 95fce4b0dd566be0a05c25b464af6f540fc6eb51 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 19 Feb 2024 16:22:25 +0100 Subject: [PATCH 025/241] Ship libc++-18-dev /usr/lib/llvm-18/lib/libc++.modules.json /usr/lib/llvm-18/include/c++/v1/std.compat.cppm /usr/lib/llvm-18/include/c++/v1/std.cppm --- debian/libc++-X.Y-dev.install.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/libc++-X.Y-dev.install.in b/debian/libc++-X.Y-dev.install.in index b3ac19c1..208e5daf 100644 --- a/debian/libc++-X.Y-dev.install.in +++ b/debian/libc++-X.Y-dev.install.in @@ -3,3 +3,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a usr/lib/llvm-@LLVM_VERSION@/include/c++/ usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a +build-llvm/modules/c++/v1/std.cppm usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ +build-llvm/modules/c++/v1/std.compat.cppm usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ +build-llvm/lib/libc++.modules.json usr/lib/llvm-@LLVM_VERSION@/lib/ From 7afcc291033b3d84dba4c990a6e10c8446aa42e8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 19 Feb 2024 16:22:25 +0100 Subject: [PATCH 026/241] Ship libc++-18-dev /usr/lib/llvm-18/lib/libc++.modules.json /usr/lib/llvm-18/include/c++/v1/std.compat.cppm /usr/lib/llvm-18/include/c++/v1/std.cppm --- debian/changelog | 19 +++++++++++++++++++ debian/libc++-X.Y-dev.install.in | 9 ++++++--- debian/libllvmlibc-X.Y-dev.install.in | 1 + debian/rules | 1 + 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 debian/libllvmlibc-X.Y-dev.install.in diff --git a/debian/changelog b/debian/changelog index 1bb8986a..25ec392a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,9 +34,28 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium +<<<<<<< * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el * Disable stack protector on mips64el +======= + [ John Paul Adrian Glaubitz ] + * Install *clang_rt* on sparc and sparc64 + * Run chrpath for libclang on sparc and sparc64 + + [ Sylvestre Ledru ] + * add -DLIBCXX_INSTALL_MODULES=ON + see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 + Ship libc++-18-dev /usr/lib/llvm-18/lib/libc++.modules.json /usr/lib/llvm-18/include/c++/v1/std.compat.cppm + /usr/lib/llvm-18/include/c++/v1/std.cppm + [ John Paul Adrian Glaubitz ] + * Install *clang_rt* on sparc and sparc64 + * Run chrpath for libclang on sparc and sparc64 + + [ Sylvestre Ledru ] + * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules + see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 +>>>>>>> -- Gianfranco Costamagna Fri, 09 Feb 2024 20:59:07 +0100 diff --git a/debian/libc++-X.Y-dev.install.in b/debian/libc++-X.Y-dev.install.in index 208e5daf..1a4d26ee 100644 --- a/debian/libc++-X.Y-dev.install.in +++ b/debian/libc++-X.Y-dev.install.in @@ -3,6 +3,9 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a usr/lib/llvm-@LLVM_VERSION@/include/c++/ usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a -build-llvm/modules/c++/v1/std.cppm usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ -build-llvm/modules/c++/v1/std.compat.cppm usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ -build-llvm/lib/libc++.modules.json usr/lib/llvm-@LLVM_VERSION@/lib/ + +# C++ modules +usr/lib/llvm-@LLVM_VERSION@/lib/libc++.modules.json +usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/std.compat/*.inc +usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/*.cppm +usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/std/*.inc diff --git a/debian/libllvmlibc-X.Y-dev.install.in b/debian/libllvmlibc-X.Y-dev.install.in new file mode 100644 index 00000000..cd6c1add --- /dev/null +++ b/debian/libllvmlibc-X.Y-dev.install.in @@ -0,0 +1 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/libllvmlibc.a diff --git a/debian/rules b/debian/rules index 0a7c37ff..a76db1d4 100755 --- a/debian/rules +++ b/debian/rules @@ -792,6 +792,7 @@ endif -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \ -DLIBCXX_INSTALL_LIBRARY=OFF \ -DLIBCXX_INSTALL_MODULES=ON \ + -DBOOTSTRAP_LIBCXX_INSTALL_MODULES=ON \ -DOPENMP_ENABLE_LIBOMP_PROFILING=OFF \ -DOPENMP_ENABLE_LIBOMPTARGET_PROFILING=OFF \ -DLIBOMP_ENABLE_RTTI=OFF \ From dbfd4f3b3f9e931569d9c382a7c67b5b82638f31 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Feb 2024 22:40:44 +0100 Subject: [PATCH 027/241] fix changelog --- debian/changelog | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25ec392a..f656e29c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,11 +34,9 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium -<<<<<<< * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el * Disable stack protector on mips64el -======= [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 * Run chrpath for libclang on sparc and sparc64 @@ -55,7 +53,6 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium [ Sylvestre Ledru ] * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 ->>>>>>> -- Gianfranco Costamagna Fri, 09 Feb 2024 20:59:07 +0100 From 4db9f7c5938247546f97976e8f0a4dd3f49e2244 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Feb 2024 22:42:46 +0100 Subject: [PATCH 028/241] Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now) --- debian/changelog | 11 +++++++++++ debian/control | 10 ++++++++++ debian/control.in | 10 ++++++++++ debian/rules | 5 ++++- 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f656e29c..3e601228 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium +<<<<<<< * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el * Disable stack protector on mips64el @@ -53,6 +54,16 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium [ Sylvestre Ledru ] * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 +======= + [ John Paul Adrian Glaubitz ] + * Install *clang_rt* on sparc and sparc64 + * Run chrpath for libclang on sparc and sparc64 + + [ Sylvestre Ledru ] + * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules + see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 + * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now) +>>>>>>> -- Gianfranco Costamagna Fri, 09 Feb 2024 20:59:07 +0100 diff --git a/debian/control b/debian/control index 9d71ef75..e1879ac0 100644 --- a/debian/control +++ b/debian/control @@ -956,3 +956,13 @@ Description: Flang library - Development package of examples, some functionalities are still missing. . This package contains the flang libraries and headers. + +# ------------- LLVM libc ------------- + +Package: libllvmlibc-18-dev +Section: libdevel +Architecture: any +Description: LLVM C Library - dev package + Implementation of the C standard library targeting C17 and above. + . + This is an experimental project. Don't use in production. diff --git a/debian/control.in b/debian/control.in index 94402b28..df9b6180 100644 --- a/debian/control.in +++ b/debian/control.in @@ -956,3 +956,13 @@ Description: Flang library - Development package of examples, some functionalities are still missing. . This package contains the flang libraries and headers. + +# ------------- LLVM libc ------------- + +Package: libllvmlibc-@LLVM_VERSION@-dev +Section: libdevel +Architecture: any +Description: LLVM C Library - dev package + Implementation of the C standard library targeting C17 and above. + . + This is an experimental project. Don't use in production. diff --git a/debian/rules b/debian/rules index a76db1d4..585c96db 100755 --- a/debian/rules +++ b/debian/rules @@ -563,7 +563,7 @@ ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS))) endif # enables cmake build targets like stage2-[target_name] -ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clang-tools;check-lld;check-libcxx;check-libcxxabi;check-mlir;check-sanitizer;llvm-config;test-suite +ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clang-tools;check-lld;check-libcxx;check-libcxxabi;check-mlir;check-libc;check-sanitizer;llvm-config;test-suite %: dh $@ $(DH_OPTIONS) @@ -1484,6 +1484,9 @@ endif # Libcxx ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxx || true +# Libc + ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libc || true + # Libcxxabi ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true From 9d92c3fc4935a23ee434004a3ca7f5e7625062ac Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Feb 2024 17:58:25 +0100 Subject: [PATCH 029/241] Refresh timestamp for changelog --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e601228..debee78a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,7 +54,6 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium [ Sylvestre Ledru ] * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 -======= [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 * Run chrpath for libclang on sparc and sparc64 @@ -63,9 +62,13 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now) +======= + * Fix 32bit builds, exclude i386, don't build clang-rt there + * Revert gold linker on mips64el + * Disable stack protector on mips64el >>>>>>> - -- Gianfranco Costamagna Fri, 09 Feb 2024 20:59:07 +0100 + -- Gianfranco Costamagna Thu, 22 Feb 2024 17:58:05 +0100 llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium From 628838e4f8eb35ac709f03d218e19265cbaa9a0e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Feb 2024 23:06:24 +0100 Subject: [PATCH 030/241] add an llvmlibc test --- debian/qualify-clang.sh | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index aa9f5e2f..c884e3c8 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -9,7 +9,7 @@ VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p") DETAILED_VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1\2\3,p") DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) -LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-clang-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb" +LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-clang-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libllvmlibc-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb " echo "To install everything:" echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*' 'libunwind-*' 'libclc-*' 'libclc-*dev' 'libmlir-*'" @@ -1139,6 +1139,26 @@ else echo "doesn't exist on this arch" fi +# libc +echo "Testing llvmlibc-$VERSION-dev ..." +echo ' +#include +int main(void) +{ + double f = 2.0; + if (isnan(f)) + return 1; + return 0; +}' > main.c +clang-$VERSION -static -nostdlib -nolibc -L/usr/lib/llvm-$VERSION/lib/ -lllvmlibc main.c -o foo +if ! ldd foo 2>&1|grep -qv libc.; then + echo "linked against regular libc" + exit -1 +fi + +# segfault for now +./foo || true + # libclc echo "Testing libclc-$VERSION-dev ..." From 5a1a595cd3bb4e2c714cae25b4f22a71160f016f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Mar 2024 18:43:06 +0100 Subject: [PATCH 031/241] New snapshot release (amd64, arm64 and armhf) --- debian/changelog | 18 +++++++++++++++--- debian/control.in | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index debee78a..12ca2e49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,9 +32,23 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental -- Sylvestre Ledru Thu, 25 Jan 2024 14:51:10 +0100 +llvm-toolchain-18 (1:18.1.0~rc3-1) unstable; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Install *clang_rt* on sparc and sparc64 + * Run chrpath for libclang on sparc and sparc64 + + [ Sylvestre Ledru ] + * New snapshot release + * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules + see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 + * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now) + (amd64, arm64 and armhf) + + -- Sylvestre Ledru Tue, 27 Feb 2024 08:43:07 +0100 + llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium -<<<<<<< * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el * Disable stack protector on mips64el @@ -62,11 +76,9 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now) -======= * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el * Disable stack protector on mips64el ->>>>>>> -- Gianfranco Costamagna Thu, 22 Feb 2024 17:58:05 +0100 diff --git a/debian/control.in b/debian/control.in index df9b6180..ec2d453a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -961,7 +961,7 @@ Description: Flang library - Development package Package: libllvmlibc-@LLVM_VERSION@-dev Section: libdevel -Architecture: any +Architecture: amd64, arm64, armhf Description: LLVM C Library - dev package Implementation of the C standard library targeting C17 and above. . From 9437bc9df33cb4bc7c5006011bf43a917b35c531 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 27 Feb 2024 13:39:07 +0100 Subject: [PATCH 032/241] fix the syntax --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index e1879ac0..fd1fe09f 100644 --- a/debian/control +++ b/debian/control @@ -961,7 +961,7 @@ Description: Flang library - Development package Package: libllvmlibc-18-dev Section: libdevel -Architecture: any +Architecture: amd64 arm64 armhf Description: LLVM C Library - dev package Implementation of the C standard library targeting C17 and above. . diff --git a/debian/control.in b/debian/control.in index ec2d453a..4941bb0b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -961,7 +961,7 @@ Description: Flang library - Development package Package: libllvmlibc-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64, arm64, armhf +Architecture: amd64 arm64 armhf Description: LLVM C Library - dev package Implementation of the C standard library targeting C17 and above. . From 6d196f744d77c869e6b17d15157a0d0ea8928e48 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 27 Feb 2024 14:06:38 +0100 Subject: [PATCH 033/241] only enable libc on 3 archs --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 585c96db..b51e1a98 100755 --- a/debian/rules +++ b/debian/rules @@ -321,6 +321,10 @@ ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) PROJECTS += ;bolt endif +ifneq (,$(filter libllvmlibc--$(LLVM_VERSION)-dev, $(packages))) + RUNTIMES += ;libc +endif + # flang is only for 64bits ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) PROJECTS += ;flang From 220331fd72800f7c33499032d3ab62d9ae9aeadd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 28 Feb 2024 11:08:49 +0100 Subject: [PATCH 034/241] rc4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12ca2e49..f16f13dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental -- Sylvestre Ledru Thu, 25 Jan 2024 14:51:10 +0100 -llvm-toolchain-18 (1:18.1.0~rc3-1) unstable; urgency=medium +llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 @@ -45,7 +45,7 @@ llvm-toolchain-18 (1:18.1.0~rc3-1) unstable; urgency=medium * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now) (amd64, arm64 and armhf) - -- Sylvestre Ledru Tue, 27 Feb 2024 08:43:07 +0100 + -- Sylvestre Ledru Wed, 28 Feb 2024 11:08:41 +0100 llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium From 4d71803afdfe32837c30e8a9bf0aaf00fcdef0fd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 1 Mar 2024 16:09:06 +0100 Subject: [PATCH 035/241] fix the activation of libc --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index b51e1a98..fc71220d 100755 --- a/debian/rules +++ b/debian/rules @@ -321,7 +321,7 @@ ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) PROJECTS += ;bolt endif -ifneq (,$(filter libllvmlibc--$(LLVM_VERSION)-dev, $(packages))) +ifneq (,$(filter libllvmlibc-$(LLVM_VERSION)-dev, $(packages))) RUNTIMES += ;libc endif From fd69092f4412e151b174ba174b6e90abf966b63d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Mar 2024 18:36:47 +0100 Subject: [PATCH 036/241] prepare upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f16f13dd..663a843e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental * Install *clang_rt* on sparc and sparc64 * Run chrpath for libclang on sparc and sparc64 - -- Sylvestre Ledru Thu, 25 Jan 2024 17:45:39 +0100 + -- Sylvestre Ledru Sat, 02 Mar 2024 18:36:35 +0100 llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental; urgency=medium From 2364186eafe4f756616162f02a7ff5a317aa3610 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Mar 2024 18:45:00 +0100 Subject: [PATCH 037/241] prepare upload --- debian/changelog | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 663a843e..c53c9074 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,4 @@ -llvm-toolchain-snapshot (1:19~++20240302063716+a30ba2ca21b0-1~exp1) UNRELEASED; urgency=medium - - * experimental New snapshot release - - -- Sylvestre Ledru Sat, 02 Mar 2024 18:37:29 +0100 - -llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:19~++20240302063716+a30ba2ca21b0-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] * hwasan_symbolize is now built also on i386 @@ -19,7 +13,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental * Install *clang_rt* on sparc and sparc64 * Run chrpath for libclang on sparc and sparc64 - -- Sylvestre Ledru Sat, 02 Mar 2024 18:36:35 +0100 + -- Sylvestre Ledru Sat, 02 Mar 2024 18:44:00 +0100 llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental; urgency=medium From 72cba48c0ece36bef89cd08f4322d39bb95302c3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Mar 2024 09:35:32 +0100 Subject: [PATCH 038/241] rebase of the patch --- .../clang-arm-default-vfp3-on-armv7a.patch | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch index f4318eb1..be9dac40 100644 --- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch +++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Target/ARM/ARM.td +Index: llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/lib/Target/ARM/ARM.td =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/Target/ARM/ARM.td -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Target/ARM/ARM.td +--- llvm-toolchain-snapshot_19~++20240303093231+800de14fab13.orig/llvm/lib/Target/ARM/ARM.td ++++ llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/lib/Target/ARM/ARM.td @@ -914,7 +914,8 @@ def ARMv6sm : Architecture<"armv6s-m", FeatureStrictAlign]>; @@ -12,16 +12,18 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/Target/ FeatureDB, FeatureDSP, FeatureAClass, -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/include/llvm/TargetParser/ARMTargetParser.def +Index: llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/include/llvm/TargetParser/ARMTargetParser.def =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/include/llvm/TargetParser/ARMTargetParser.def -@@ -68,7 +68,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "+v6 +--- llvm-toolchain-snapshot_19~++20240303093231+800de14fab13.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def ++++ llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/include/llvm/TargetParser/ARMTargetParser.def +@@ -92,8 +92,8 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "+v6 + FK_VFPV2, (ARM::AEK_SEC | ARM::AEK_DSP)) ARM_ARCH("armv6-m", ARMV6M, "6-M", "+v6m", ARMBuildAttrs::CPUArch::v6_M, - FK_NONE, ARM::AEK_NONE) - ARM_ARCH("armv7-a", ARMV7A, "7-A", "+v7", ARMBuildAttrs::CPUArch::v7, -- FK_NEON, ARM::AEK_DSP) -+ FK_VFPV3_D16 /* Hard float */, ARM::AEK_DSP) + FK_NONE, ARM::AEK_NONE) +-ARM_ARCH("armv7-a", ARMV7A, "7-A", "+v7", ARMBuildAttrs::CPUArch::v7, FK_NEON, +- ARM::AEK_DSP) ++ARM_ARCH("armv7-a", ARMV7A, "7-A", "+v7", ARMBuildAttrs::CPUArch::v7, ++ FK_VFPV3_D16 /* Hard float */, ARM::AEK_DSP) ARM_ARCH("armv7ve", ARMV7VE, "7VE", "+v7ve", ARMBuildAttrs::CPUArch::v7, - FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | - ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP)) + FK_NEON, + (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM | From c83baea057017188fea361e57bc81ce69005cf56 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Mar 2024 10:08:00 +0100 Subject: [PATCH 039/241] fix the minor declaration when building snapshot --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 8328d509..e8a1a86f 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,7 @@ LLVM_VERSION_MINOR := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:[0-9 LLVM_VERSION_SNAPSHOT := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:(.*),\1,p") ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL)) LLVM_VERSION_FULL := $(LLVM_VERSION).0.0 + LLVM_VERSION_MINOR := 0 endif LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$NF+=1; print}') From 45469816b2b2bcd71ae3ba26d3bf52cec2475f9d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Mar 2024 21:02:39 +0100 Subject: [PATCH 040/241] fix the version --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index fd1fe09f..50be5cf1 100644 --- a/debian/control +++ b/debian/control @@ -959,7 +959,7 @@ Description: Flang library - Development package # ------------- LLVM libc ------------- -Package: libllvmlibc-18-dev +Package: libllvmlibc-19-dev Section: libdevel Architecture: amd64 arm64 armhf Description: LLVM C Library - dev package From 605f2d257d921c847656c28132e08d86e10a070f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Mar 2024 21:04:48 +0100 Subject: [PATCH 041/241] remove the minor for llvm --- debian/libllvmX.Y.install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index 11f472d2..aa15c980 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1,3 +1,3 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION_MINOR@ +#usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ From 3af4ca0f49e13888eaa9062531e9b52ecf970555 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Mar 2024 22:17:54 +0100 Subject: [PATCH 042/241] fix the soname --- debian/libllvmX.Y.install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index aa15c980..ce46f373 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1,3 +1,3 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so /usr/lib/@DEB_HOST_MULTIARCH@/ -#usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION_MINOR@ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ From aa5bd2378fc2d1207d5fd97c4d9f47bd39646643 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 4 Mar 2024 09:00:13 +0100 Subject: [PATCH 043/241] rebase of the patch --- debian/patches/wasm/wasm-sysroot-usr.diff | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff index 592946a3..b0f4ec28 100644 --- a/debian/patches/wasm/wasm-sysroot-usr.diff +++ b/debian/patches/wasm/wasm-sysroot-usr.diff @@ -1,10 +1,10 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +--- llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.cpp @@ -200,7 +200,7 @@ WebAssembly::WebAssembly(const Driver &D - getProgramPaths().push_back(getDriver().getInstalledDir()); + getProgramPaths().push_back(getDriver().Dir); - auto SysRoot = getDriver().SysRoot; + std::string SysRoot = computeSysRoot(); @@ -107,10 +107,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver + addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward"); + } } -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +--- llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.h @@ -88,6 +88,8 @@ private: llvm::opt::ArgStringList &CC1Args) const; void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs, From a20cfdad533b3a8cf72e0ffc01675904e2dafadc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 4 Mar 2024 09:01:16 +0100 Subject: [PATCH 044/241] update of the changelog --- debian/changelog | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index a30df64c..217b8641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -llvm-toolchain-snapshot (1:19~++20240302063716+a30ba2ca21b0-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] + * New snapshot release * hwasan_symbolize is now built also on i386 * Update of the libomp symbols * Also install usr/lib/llvm-19/lib/libLLVM.so.1 @@ -13,7 +14,7 @@ llvm-toolchain-snapshot (1:19~++20240302063716+a30ba2ca21b0-1~exp1) experimental * Install *clang_rt* on sparc and sparc64 * Run chrpath for libclang on sparc and sparc64 - -- Sylvestre Ledru Sat, 02 Mar 2024 18:44:00 +0100 + -- Sylvestre Ledru Mon, 04 Mar 2024 09:00:56 +0100 llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental; urgency=medium @@ -28,7 +29,6 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium -<<<<<<< [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 * Run chrpath for libclang on sparc and sparc64 @@ -39,7 +39,6 @@ llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now) (amd64, arm64 and armhf) -======= [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 * Run chrpath for libclang on sparc and sparc64 @@ -52,13 +51,11 @@ llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium (amd64, arm64 and armhf) * Also install usr/lib/llvm-19/lib/libLLVM.so.1 and usr/lib/llvm-19/lib/libLLVM.so.18.0 ->>>>>>> -- Sylvestre Ledru Wed, 28 Feb 2024 11:08:41 +0100 llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium -<<<<<<< * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el * Disable stack protector on mips64el @@ -89,11 +86,9 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el * Disable stack protector on mips64el -======= * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el * Disable stack protector on mips64el ->>>>>>> -- Gianfranco Costamagna Thu, 22 Feb 2024 17:58:05 +0100 From 7fcd59bdf3bbfb7d94faaacf85c566c5319f48c1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 4 Mar 2024 21:33:23 +0100 Subject: [PATCH 045/241] rebase of the patch --- .../23-strlcpy_strlcat_warning_removed.diff | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 3199da50..5d54a768 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,10 +7,10 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/Decl.cpp +--- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/Decl.cpp @@ -4381,13 +4381,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/SemaChecking.cpp +--- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/SemaChecking.cpp @@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: @@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -7660,10 +7660,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -7804,10 +7804,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -59,27 +59,27 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +--- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules - {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, + {{CDM::CLibrary, {BI.getName(Builtin::BIstrncat)}}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, -- {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}}, -+/* {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}}, +- {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}}, ++/* {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}}, TR::Prop({{1, 2}}, {{0}})}, - {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcat)}}, + {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcat)}}, - TR::Prop({{1, 2}}, {{0}})}, -+ TR::Prop({{1, 2}}, {{0}})},*/ - {{CDF_MaybeBuiltin, {{"snprintf"}}}, ++ TR::Prop({{1, 2}}, {{0}})},*/ + {{CDM::CLibrary, {{"snprintf"}}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, - {{CDF_MaybeBuiltin, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/builtins.c + {{CDM::CLibrary, {{"sprintf"}}}, +Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -111,10 +111,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -171,11 +171,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/clang/Basic/Builtins.td +Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/include/clang/Basic/Builtins.td =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/include/clang/Basic/Builtins.td -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/clang/Basic/Builtins.td -@@ -3225,7 +3225,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h +--- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/include/clang/Basic/Builtins.td +@@ -3231,7 +3231,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h // non-standard but very common @@ -185,7 +185,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/cl let Spellings = ["strlcpy"]; let Prototype = "size_t(char*, char const*, size_t)"; } -@@ -3234,6 +3235,7 @@ def StrlCat : GNULibBuiltin<"string.h"> +@@ -3240,6 +3241,7 @@ def StrlCat : GNULibBuiltin<"string.h"> let Spellings = ["strlcat"]; let Prototype = "size_t(char*, char const*, size_t)"; } From 7c735bfe612e13fafa156a45ca79db0e76c87936 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 5 Mar 2024 23:41:07 +0100 Subject: [PATCH 046/241] * Make libclang-common-19-dev architecture dependent. --- debian/changelog | 6 ++++++ debian/control | 12 ++++++------ debian/control.in | 12 ++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 217b8641..705e1dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp2) UNRELEASED; urgency=medium + + * Make libclang-common-19-dev architecture dependent. + + -- Matthias Klose Tue, 05 Mar 2024 23:37:18 +0100 + llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/control b/debian/control index 50be5cf1..ed4ae3b4 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libllvm19 (= ${binary:Version}), - libclang-common-19-dev (= ${source:Version}), + libclang-common-19-dev (= ${binary:Version}), llvm-19-linker-tools (= ${binary:Version}), libclang1-19 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler @@ -96,7 +96,7 @@ Package: clang-tidy-19 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libllvm19 (= ${binary:Version}), - libclang-common-19-dev (= ${source:Version}), + libclang-common-19-dev (= ${binary:Version}), clang-tools-19, python3-yaml Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming @@ -108,7 +108,7 @@ Package: clangd-19 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}), - libclang-common-19-dev (= ${source:Version}), + libclang-common-19-dev (= ${binary:Version}), Description: Language server that provides IDE-like features to editors clangd understands your C++ code and adds smart features to your editor: - code completion @@ -161,7 +161,7 @@ Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libclang1-19 (= ${binary:Version}), - libclang-common-19-dev (= ${source:Version}) + libclang-common-19-dev (= ${binary:Version}) Description: Clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -174,8 +174,8 @@ Description: Clang library - Development package libclang1-19. Package: libclang-common-19-dev -Architecture: all -Multi-Arch: foreign +Architecture: any +Multi-Arch: same Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: libclang-rt-19-dev diff --git a/debian/control.in b/debian/control.in index 4941bb0b..d9df68f9 100644 --- a/debian/control.in +++ b/debian/control.in @@ -47,7 +47,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libllvm@LLVM_VERSION@ (= ${binary:Version}), - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}), libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler @@ -96,7 +96,7 @@ Package: clang-tidy-@LLVM_VERSION@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libllvm@LLVM_VERSION@ (= ${binary:Version}), - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), clang-tools-@LLVM_VERSION@, python3-yaml Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming @@ -108,7 +108,7 @@ Package: clangd-@LLVM_VERSION@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}), - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), Description: Language server that provides IDE-like features to editors clangd understands your C++ code and adds smart features to your editor: - code completion @@ -161,7 +161,7 @@ Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@ (= ${binary:Version}), - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}) + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}) Description: Clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -174,8 +174,8 @@ Description: Clang library - Development package libclang1-@LLVM_VERSION@. Package: libclang-common-@LLVM_VERSION@-dev -Architecture: all -Multi-Arch: foreign +Architecture: any +Multi-Arch: same Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: libclang-rt-@LLVM_VERSION@-dev From 742438d44df14e2bd41a43fc2cfdc4cb7784a2a8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Mar 2024 19:27:17 +0100 Subject: [PATCH 047/241] Add python3-pexpect in the build dep for lldb --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 705e1dfb..500b0ef3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp2) UNRELEASED; urgency=medium * Make libclang-common-19-dev architecture dependent. + * Add python3-pexpect in the build dep for lldb -- Matthias Klose Tue, 05 Mar 2024 23:37:18 +0100 diff --git a/debian/control b/debian/control index ed4ae3b4..f2a4cfea 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, lcov, procps, help2man, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], - libjs-mathjax, python3-myst-parser | python3-recommonmark, + libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen, ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], diff --git a/debian/control.in b/debian/control.in index d9df68f9..9b50152e 100644 --- a/debian/control.in +++ b/debian/control.in @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, lcov, procps, help2man, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], - libjs-mathjax, python3-myst-parser | python3-recommonmark, + libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen, ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], From 7165b443dbf3698e645816fc037a652bac7fe53a Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 12 Mar 2024 12:55:00 +0100 Subject: [PATCH 048/241] * Fix sanitizer build on 32bit time_t64 architectures. --- debian/changelog | 5 +++-- debian/patches/libsanitizer-timebits.diff | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 debian/patches/libsanitizer-timebits.diff diff --git a/debian/changelog b/debian/changelog index 500b0ef3..a0e4d6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp2) UNRELEASED; urgency=medium * Make libclang-common-19-dev architecture dependent. - * Add python3-pexpect in the build dep for lldb + * Add python3-pexpect in the build dep for lldb. + * Fix sanitizer build on 32bit time_t64 architectures. - -- Matthias Klose Tue, 05 Mar 2024 23:37:18 +0100 + -- Matthias Klose Tue, 12 Mar 2024 12:54:07 +0100 llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp1) experimental; urgency=medium diff --git a/debian/patches/libsanitizer-timebits.diff b/debian/patches/libsanitizer-timebits.diff new file mode 100644 index 00000000..f5ee919a --- /dev/null +++ b/debian/patches/libsanitizer-timebits.diff @@ -0,0 +1,22 @@ +# DP: Add another #undef for _TIME_BITS + +--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + # include +#--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +#+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +#@@ -18,6 +18,7 @@ +# // depends on _FILE_OFFSET_BITS setting. +# // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. +# #undef _FILE_OFFSET_BITS +#+#undef _TIME_BITS +# #endif +# +# // Must go after undef _FILE_OFFSET_BITS. diff --git a/debian/patches/series b/debian/patches/series index 053d7b9c..04c9e844 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -149,3 +149,4 @@ D148945-revert.diff arm32-defaults.diff mips/D154390-pre-R6.diff disable-openmp-per-target.diff +libsanitizer-timebits.diff From 98d62a20039357601ed68706619a5915208ea2e2 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 12 Mar 2024 13:04:21 +0100 Subject: [PATCH 049/241] * Refresh the 23-strlcpy_strlcat_warning_removed patch. --- debian/changelog | 1 + .../23-strlcpy_strlcat_warning_removed.diff | 50 +++++++++---------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0e4d6ba..ca163282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp2) UNRELEASED; * Make libclang-common-19-dev architecture dependent. * Add python3-pexpect in the build dep for lldb. * Fix sanitizer build on 32bit time_t64 architectures. + * Refresh the 23-strlcpy_strlcat_warning_removed patch. -- Matthias Klose Tue, 12 Mar 2024 12:54:07 +0100 diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 5d54a768..30991dd9 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,10 +7,10 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/Decl.cpp +--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/AST/Decl.cpp @@ -4381,13 +4381,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/SemaChecking.cpp +--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/Sema/SemaChecking.cpp @@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: @@ -59,27 +59,27 @@ Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules - {{CDM::CLibrary, {BI.getName(Builtin::BIstrncat)}}, + {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, -- {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}}, -+/* {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}}, +- {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}}, ++/* {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}}, TR::Prop({{1, 2}}, {{0}})}, - {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcat)}}, + {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcat)}}, - TR::Prop({{1, 2}}, {{0}})}, -+ TR::Prop({{1, 2}}, {{0}})},*/ - {{CDM::CLibrary, {{"snprintf"}}}, ++ TR::Prop({{1, 2}}, {{0}})},*/ + {{CDF_MaybeBuiltin, {{"snprintf"}}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, - {{CDM::CLibrary, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/builtins.c + {{CDF_MaybeBuiltin, {{"sprintf"}}}, +Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -111,10 +111,10 @@ Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -171,10 +171,10 @@ Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} -Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/include/clang/Basic/Builtins.td +Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/include/clang/Basic/Builtins.td =================================================================== ---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/include/clang/Basic/Builtins.td -+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/include/clang/Basic/Builtins.td +--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/include/clang/Basic/Builtins.td @@ -3231,7 +3231,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h // non-standard but very common From 0f22b2b8af5edb04b900f3382f94a9fefd9ba32e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 12 Mar 2024 18:26:38 +0100 Subject: [PATCH 050/241] * Build-depend on llvm-spirv-18 instead of llvm-spirv-17. --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca163282..9907d01a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp2) UNRELEASED; * Add python3-pexpect in the build dep for lldb. * Fix sanitizer build on 32bit time_t64 architectures. * Refresh the 23-strlcpy_strlcat_warning_removed patch. + * Build-depend on llvm-spirv-18 instead of llvm-spirv-17. -- Matthias Klose Tue, 12 Mar 2024 12:54:07 +0100 diff --git a/debian/control b/debian/control index f2a4cfea..a8b8d6e7 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled - llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , + llvm-spirv-18 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , spirv-tools [linux-any] | hello [linux-any], wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev, diff --git a/debian/control.in b/debian/control.in index 9b50152e..cb44c31b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled - llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , + llvm-spirv-18 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , spirv-tools [linux-any] | hello [linux-any], wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev, From 31aa8224943a69c19f42f45d733b943935f06adb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 12 Mar 2024 21:38:23 +0100 Subject: [PATCH 051/241] adjust the version detection after 81e20472a0c5a4a8edc5ec38dc345d580681af81 --- debian/unpack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/unpack.sh b/debian/unpack.sh index b83f6004..26ba3f2d 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -14,7 +14,7 @@ echo "unpack of $LLVM_ARCHIVE" tar Jxf $LLVM_ARCHIVE cd llvm-toolchain-${ORIG_VERSION}_$MAJOR_VERSION~+$VERSION/ -VER_FOUND=$(grep "LLVM_VERSION_MAJOR " llvm/CMakeLists.txt|awk '{print $2}'|cut -d\) -f1) +VER_FOUND=$(grep "LLVM_VERSION_MAJOR " cmake/Modules/LLVMVersion.cmake|awk '{print $2}'|cut -d\) -f1) if test "${MAJOR_VERSION}" != "$VER_FOUND" -a "${MAJOR_VERSION}.0.0" != "$VER_FOUND" -a "${MAJOR_VERSION}.0.0git" != "$VER_FOUND" -a "${MAJOR_VERSION}git" != "$VER_FOUND"; then echo "Mismatch of version" echo "Expected $MAJOR_VERSION / Found $VER_FOUND" From 4ef11b372a93eddb42d297d1665cf18ee23aed35 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 12 Mar 2024 21:39:42 +0100 Subject: [PATCH 052/241] rebase of the patch --- .../23-strlcpy_strlcat_warning_removed.diff | 65 ++++++++++--------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 30991dd9..d92cbd09 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,11 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/AST/Decl.cpp -@@ -4381,13 +4381,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/AST/Decl.cpp +@@ -4388,13 +4388,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/Sema/SemaChecking.cpp +--- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/Sema/SemaChecking.cpp @@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: @@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -7804,10 +7804,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -7822,10 +7822,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -59,27 +59,30 @@ Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules +--- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -720,12 +720,12 @@ void GenericTaintChecker::initTaintRules - {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, + {{CDM::CLibrary, {BI.getName(Builtin::BIstrncat)}}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, -- {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}}, -+/* {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}}, +- {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}}, ++/* {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}}, TR::Prop({{1, 2}}, {{0}})}, - {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcat)}}, + {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcat)}}, - TR::Prop({{1, 2}}, {{0}})}, -+ TR::Prop({{1, 2}}, {{0}})},*/ - {{CDF_MaybeBuiltin, {{"snprintf"}}}, - TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, - {{CDF_MaybeBuiltin, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/builtins.c ++ TR::Prop({{1, 2}}, {{0}})},*/ + {{CDM::CLibrary, {{"snprintf"}}}, +- TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, ++ TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, + {{CDM::CLibrary, {{"sprintf"}}}, + TR::Prop({{1}, 2}, {{0, ReturnValueIndex}})}, + {{CDM::CLibrary, {{"strcpy"}}}, TR::Prop({{1}}, {{0, ReturnValueIndex}})}, +Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -111,10 +114,10 @@ Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -171,11 +174,11 @@ Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} -Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/include/clang/Basic/Builtins.td +Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/include/clang/Basic/Builtins.td =================================================================== ---- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/include/clang/Basic/Builtins.td -+++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/include/clang/Basic/Builtins.td -@@ -3231,7 +3231,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h +--- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/include/clang/Basic/Builtins.td +@@ -3254,7 +3254,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h // non-standard but very common @@ -185,7 +188,7 @@ Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/include/cl let Spellings = ["strlcpy"]; let Prototype = "size_t(char*, char const*, size_t)"; } -@@ -3240,6 +3241,7 @@ def StrlCat : GNULibBuiltin<"string.h"> +@@ -3263,6 +3264,7 @@ def StrlCat : GNULibBuiltin<"string.h"> let Spellings = ["strlcat"]; let Prototype = "size_t(char*, char const*, size_t)"; } From 5d5f1fc6f60e7d8f2010e4567a7954d9c7365b3f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 15 Mar 2024 22:03:10 +0100 Subject: [PATCH 053/241] rebase of the patches --- debian/patches/0044-soname.diff | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 99aed5a0..587b2fc3 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -3,10 +3,10 @@ tools/llvm-shlib/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240226095317+113052b2b022.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/clang/tools/libclang/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8/clang/tools/libclang/CMakeLists.txt @@ -135,7 +135,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,13 +16,13 @@ Index: llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-18_18.1.0-rc4/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-18_18.1.0-rc4.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-18_18.1.0-rc4/llvm/tools/llvm-shlib/CMakeLists.txt -@@ -38,6 +38,8 @@ if(LLVM_BUILD_LLVM_DYLIB) - get_target_property(LLVM_DYLIB_SOVERSION LLVM SOVERSION) - llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} LLVM SHARED COMPONENT LLVM SOVERSION ${LLVM_DYLIB_SOVERSION}) +--- llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8/llvm/tools/llvm-shlib/CMakeLists.txt +@@ -37,6 +37,8 @@ if(LLVM_BUILD_LLVM_DYLIB) + # Add symlink for backwards compatibility with old library name + llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} $ SHARED FULL_DEST COMPONENT LLVM) + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + From 6dee861892a65fbc6508ba93f6fb82851af1f25b Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 16 Mar 2024 20:05:42 +0100 Subject: [PATCH 054/241] * Add a stage1 profile to disable curl, grpc and spirv. --- debian/changelog | 1 + debian/control | 10 +++++----- debian/control.in | 10 +++++----- debian/rules | 10 ++++++++-- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9907d01a..7388531b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp2) UNRELEASED; * Fix sanitizer build on 32bit time_t64 architectures. * Refresh the 23-strlcpy_strlcat_warning_removed patch. * Build-depend on llvm-spirv-18 instead of llvm-spirv-17. + * Add a stage1 profile to disable curl, grpc and spirv. -- Matthias Klose Tue, 12 Mar 2024 12:54:07 +0100 diff --git a/debian/control b/debian/control index a8b8d6e7..a78b7495 100644 --- a/debian/control +++ b/debian/control @@ -29,11 +29,11 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv-18 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , spirv-tools [linux-any] | hello [linux-any], wasi-libc | hello, - libcurl4-openssl-dev | libcurl-dev, - libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] + libcurl4-openssl-dev | libcurl-dev , + libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , Build-Conflicts: oprofile Standards-Version: 4.6.2 Homepage: https://www.llvm.org/ diff --git a/debian/control.in b/debian/control.in index cb44c31b..56eee015 100644 --- a/debian/control.in +++ b/debian/control.in @@ -29,11 +29,11 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv-18 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , spirv-tools [linux-any] | hello [linux-any], wasi-libc | hello, - libcurl4-openssl-dev | libcurl-dev, - libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] + libcurl4-openssl-dev | libcurl-dev , + libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , Build-Conflicts: oprofile Standards-Version: 4.6.2 Homepage: https://www.llvm.org/ diff --git a/debian/rules b/debian/rules index e8a1a86f..a63d8859 100755 --- a/debian/rules +++ b/debian/rules @@ -176,6 +176,7 @@ STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH) # clangd remote index support requires GRPC & protobuf. # Enable if minimum tested versions are available. CLANGD_GRPC_INSTALLED=no +ifeq (,$(filter stage1, $(DEB_BUILD_PROFILES))) ifeq ($(shell v=$$(dpkg-query -W -f '$${Version}' libgrpc++-dev 2>/dev/null); if [ -z "$$v" ]; then echo 1; else dpkg --compare-versions $$v gt 1.30.0; echo $$?; fi),0) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler-grpc) gt 1.30.0; echo $$?),0) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libprotobuf-dev) gt 3.12.0; echo $$?),0) @@ -186,6 +187,7 @@ endif endif endif endif +endif export CC=gcc-$(GCC_VERSION) export CXX=g++-$(GCC_VERSION) @@ -282,6 +284,9 @@ else control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev' endif +ifneq (,$(filter stage1, $(DEB_BUILD_PROFILES))) + LLVM_SPIRV_INSTALLED = no +else LLVM_SPIRV_VERSION := $(LLVM_VERSION) LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null) ifndef LLVM_SPIRV @@ -303,6 +308,7 @@ else LLVM_SPIRV_INSTALLED = yes endif endif +endif LIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl LIBCLC_LLVM_SPIRV = @@ -779,7 +785,7 @@ endif -DLLVM_INCLUDE_GO_TESTS=OFF \ -DLLVM_USE_RELATIVE_PATHS_IN_FILES=ON \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ - -DLLVM_ENABLE_CURL=ON \ + -DLLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \ -DLLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO=ON \ -DCLANG_PLUGIN_SUPPORT=OFF \ -DCLANG_BUILD_EXAMPLES=OFF \ @@ -833,7 +839,7 @@ endif -DBOOTSTRAP_LLVM_POLLY_LINK_INTO_TOOLS=ON \ -DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa" \ -DBOOTSTRAP_LLVM_LINK_LLVM_DYLIB=ON \ - -DBOOTSTRAP_LLVM_ENABLE_CURL=ON \ + -DBOOTSTRAP_LLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \ -DBOOTSTRAP_CLANG_LINK_CLANG_DYLIB=ON \ -DBOOTSTRAP_LIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \ -DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \ From fa56ca9efc50329f6f47111c438f24205245ce6e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 16 Mar 2024 21:13:55 +0100 Subject: [PATCH 055/241] also add spirv-tools b-d to stage1 --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index a78b7495..c6cfb2ea 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled llvm-spirv-18 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , - spirv-tools [linux-any] | hello [linux-any], + spirv-tools [linux-any] | hello [linux-any], wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev , libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , diff --git a/debian/control.in b/debian/control.in index 56eee015..ab11703a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled llvm-spirv-18 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , - spirv-tools [linux-any] | hello [linux-any], + spirv-tools [linux-any] | hello [linux-any], wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev , libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , From 9dcf3eecb58c46fd5a7f9728c0ee9ba99dfc40d6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 17 Mar 2024 22:30:36 +0100 Subject: [PATCH 056/241] rebase of the patch --- debian/patches/0044-soname.diff | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 587b2fc3..9cd0694c 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -3,10 +3,10 @@ tools/llvm-shlib/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8/clang/tools/libclang/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da/clang/tools/libclang/CMakeLists.txt @@ -135,7 +135,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,13 +16,13 @@ Index: llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240315100115+60fa2b0670b8/llvm/tools/llvm-shlib/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da/llvm/tools/llvm-shlib/CMakeLists.txt @@ -37,6 +37,8 @@ if(LLVM_BUILD_LLVM_DYLIB) # Add symlink for backwards compatibility with old library name - llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} $ SHARED FULL_DEST COMPONENT LLVM) + llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} $ SHARED FULL_DEST COMPONENT LLVM) + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + From 7eec61e6a3f2eae760588e999b55e0b4a0f08d66 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 17 Mar 2024 22:32:08 +0100 Subject: [PATCH 057/241] update of the unapack script to automatically refresh the patch --- debian/unpack.sh | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/debian/unpack.sh b/debian/unpack.sh index 26ba3f2d..666094eb 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -23,4 +23,39 @@ if test "${MAJOR_VERSION}" != "$VER_FOUND" -a "${MAJOR_VERSION}.0.0" != "$VER_FO fi cp -R ../$ORIG_VERSION/debian . -QUILT_PATCHES=debian/patches/ quilt push -a --fuzz=0 + +export QUILT_PATCHES=debian/patches/ + +attempt=0 +max_attempts=5 + +while [ $attempt -lt $max_attempts ]; do + echo $attempt + attempt=$((attempt+1)) + echo "Attempt $attempt of $max_attempts" + + # Attempt to apply patches without allowing fuzz + output=$(quilt push -a --fuzz=0 || true 2>&1) + + echo "$output" + + # Check if the quilt push command failed due to a hunk failure + if echo "$output" | grep -q "hunk FAILED"; then + echo "Initial quilt push failed, trying without --fuzz=0..." + output=$(quilt push || true 2>&1) + echo "$output" + # Check if the output contains a line indicating fuzz was applied + if echo "$output" | grep -q "with fuzz"; then + echo "Fuzz detected, refreshing patch..." + quilt refresh + cp -R debian/patches/* ../$ORIG_VERSION/debian/patches/ + fi + else + echo "Patches applied successfully." + break # Exit the loop if patches were applied successfully + fi +done + +if [ $attempt -eq $max_attempts ]; then + echo "Reached maximum attempt limit without successfully applying all patches." +fi From 6291f05e5f4dabaea4b8df4674e3e015eb440d1f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 19 Mar 2024 09:51:11 +0100 Subject: [PATCH 058/241] rebase of the patch --- debian/patches/wasm/wasm-ld-path.diff | 38 +++++++++++++-------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/debian/patches/wasm/wasm-ld-path.diff b/debian/patches/wasm/wasm-ld-path.diff index 5617766b..4a192d0d 100644 --- a/debian/patches/wasm/wasm-ld-path.diff +++ b/debian/patches/wasm/wasm-ld-path.diff @@ -1,27 +1,25 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h -@@ -10,9 +10,13 @@ - #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_WEBASSEMBLY_H +--- llvm-toolchain-snapshot_19~++20240319094628+703920d4138d.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -20,6 +20,11 @@ + #include "llvm/Support/Path.h" + #include "llvm/Support/VirtualFileSystem.h" - #include "Gnu.h" +#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR - #include "clang/Driver/Tool.h" - #include "clang/Driver/ToolChain.h" - ++ +#define TOSTR2(X) #X +#define TOSTR(X) TOSTR2(X) + - namespace clang { - namespace driver { - namespace tools { -@@ -67,7 +71,7 @@ private: - llvm::opt::ArgStringList &CmdArgs) const override; - SanitizerMask getSupportedSanitizers() const override; + using namespace clang::driver; + using namespace clang::driver::tools; + using namespace clang::driver::toolchains; +@@ -241,7 +246,7 @@ WebAssembly::WebAssembly(const Driver &D + const char *WebAssembly::getDefaultLinker() const { + if (getOS() == "wasip2") + return "wasm-component-ld"; +- return "wasm-ld"; ++ return "wasm-ld-" TOSTR(LLVM_VERSION_MAJOR); + } -- const char *getDefaultLinker() const override { return "wasm-ld"; } -+ const char *getDefaultLinker() const override { return "wasm-ld-" TOSTR(LLVM_VERSION_MAJOR); } - - CXXStdlibType GetDefaultCXXStdlibType() const override { - return ToolChain::CST_Libcxx; + bool WebAssembly::IsMathErrnoDefault() const { return false; } From 248780e81f75dd341993bef1cf580f05bf1e3062 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 20 Mar 2024 18:02:35 +0100 Subject: [PATCH 059/241] rebase of the patch --- debian/patches/mips/mips-fpxx-enable.diff | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/mips/mips-fpxx-enable.diff b/debian/patches/mips/mips-fpxx-enable.diff index 86c6b1d0..3d5ec7a4 100644 --- a/debian/patches/mips/mips-fpxx-enable.diff +++ b/debian/patches/mips/mips-fpxx-enable.diff @@ -1,14 +1,14 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/Target/Mips/MipsSubtarget.cpp +Index: llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/Mips/MipsSubtarget.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/Target/Mips/MipsSubtarget.cpp +--- llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp ++++ llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/Mips/MipsSubtarget.cpp @@ -81,7 +81,7 @@ MipsSubtarget::MipsSubtarget(const Tripl InMips16HardFloat(Mips16HardFloat), InMicroMipsMode(false), HasDSP(false), HasDSPR2(false), HasDSPR3(false), AllowMixed16_32(Mixed16_32 || Mips_Os16), Os16(Mips_Os16), HasMSA(false), UseTCCInDIV(false), HasSym32(false), - HasEVA(false), DisableMadd4(false), HasMT(false), HasCRC(false), + HasEVA(false), DisableMadd4(true), HasMT(false), HasCRC(false), - HasVirt(false), HasGINV(false), UseIndirectJumpsHazard(false), + HasVirt(false), HasGINV(false), UseIndirectJumpsHazard(false), StrictAlign(false), StackAlignOverride(StackAlignOverride), TM(TM), TargetTriple(TT), TSInfo(), InstrInfo(MipsInstrInfo::create( @@ -92,6 +92,9 @@ MipsSubtarget::MipsSubtarget(const Tripl From 8d4c8b4bb356baacd92e02017acd67e644595f4d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 21 Mar 2024 10:37:20 +0100 Subject: [PATCH 060/241] rebase of the patch --- debian/patches/openmp-fix-runtimes-build.diff | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 1fb7300d..2adafda4 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_19~++20240302114133+c4f59937cae9/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/llvm/runtimes/CM -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -522,7 +523,7 @@ if(runtimes) +@@ -555,7 +556,7 @@ if(runtimes) # build directory cannot find the C++ headers in certain configurations. # I need to build a mechanism for runtime projects to provide CMake code # that executes at LLVM configuration time to handle this case. @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/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_19~++20240302114133+c4f59937cae9/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/CMakeLists.txt @@ -119,6 +119,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,23 +56,10 @@ Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/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_19~++20240302114133+c4f59937cae9/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -@@ -75,6 +75,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma - "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports") - endif() - -+ add_runtimes_build_depends_if_needed("omptarget.rtl.${tmachine_libname}") -+ - # Install plugin under the lib destination folder. - install(TARGETS "omptarget.rtl.${tmachine_libname}" - LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") -Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt @@ -81,6 +81,8 @@ else() " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() @@ -82,10 +69,10 @@ Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/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_19~++20240302114133+c4f59937cae9/openmp/libomptarget/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/libomptarget/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptarget/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/libomptarget/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/src/CMakeLists.txt @@ -43,6 +43,9 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY @@ -96,10 +83,10 @@ Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/libomptar target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/runtime/CMakeLists.txt @@ -318,6 +318,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -111,10 +98,10 @@ Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/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_19~++20240302114133+c4f59937cae9/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/runtime/src/CMakeLists.txt @@ -144,6 +144,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -132,10 +119,10 @@ Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/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_19~++20240302114133+c4f59937cae9/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/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) @@ -146,3 +133,16 @@ Index: llvm-toolchain-snapshot_19~++20240302114133+c4f59937cae9/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) +Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt +@@ -51,6 +51,8 @@ if(LIBOMP_HAVE_VERSION_SCRIPT_FLAG) + "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports") + endif() + ++add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") ++ + # Install plugin under the lib destination folder. + install(TARGETS omptarget.rtl.${machine} + LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") From 32b95a22e30ba5f8a936b52dcfd6ae1518d960b2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 21 Mar 2024 13:27:21 +0100 Subject: [PATCH 061/241] rebase of the patch --- debian/patches/0044-soname.diff | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 9cd0694c..c338304a 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -3,10 +3,10 @@ tools/llvm-shlib/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da/clang/tools/libclang/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240319094628+703920d4138d.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/tools/libclang/CMakeLists.txt @@ -135,7 +135,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,13 +16,13 @@ Index: llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240317102230+8e5de66af3da/llvm/tools/llvm-shlib/CMakeLists.txt -@@ -37,6 +37,8 @@ if(LLVM_BUILD_LLVM_DYLIB) - # Add symlink for backwards compatibility with old library name - llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} $ SHARED FULL_DEST COMPONENT LLVM) +--- llvm-toolchain-snapshot_19~++20240319094628+703920d4138d.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/llvm/tools/llvm-shlib/CMakeLists.txt +@@ -41,6 +41,8 @@ if(LLVM_BUILD_LLVM_DYLIB) + llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} $ SHARED FULL_DEST COMPONENT LLVM) + endif() + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + From 9df938184614459ec18fb7197285bab9e9c60731 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 23 Mar 2024 19:55:45 +0100 Subject: [PATCH 062/241] rebase of the patches --- debian/patches/openmp-fix-runtimes-build.diff | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 2adafda4..2cda5139 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_19~++20240321103016+ee5e027cc649/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/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_19~++20240321103016+ee5e027cc649/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/CMakeLists.txt @@ -119,6 +119,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,11 +56,11 @@ Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/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_19~++20240321103016+ee5e027cc649/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -@@ -81,6 +81,8 @@ else() +--- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +@@ -52,6 +52,8 @@ else() " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() @@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/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_19~++20240321103016+ee5e027cc649/openmp/libomptarget/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/libomptarget/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/libomptarget/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/src/CMakeLists.txt @@ -43,6 +43,9 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY @@ -83,10 +83,10 @@ Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptar target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/runtime/CMakeLists.txt @@ -318,6 +318,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -98,10 +98,10 @@ Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/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_19~++20240321103016+ee5e027cc649/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/runtime/src/CMakeLists.txt @@ -144,6 +144,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -119,10 +119,10 @@ Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/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_19~++20240321103016+ee5e027cc649/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/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) @@ -133,12 +133,12 @@ Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) -Index: llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649.orig/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240321103016+ee5e027cc649/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt -@@ -51,6 +51,8 @@ if(LIBOMP_HAVE_VERSION_SCRIPT_FLAG) - "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports") +--- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt +@@ -31,6 +31,8 @@ else() + target_include_directories(omptarget.rtl.${machine} PRIVATE dynamic_ffi) endif() +add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") From 5ec2f2a4368ca1077e03166d0b60498de731deb4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 26 Mar 2024 09:34:37 +0100 Subject: [PATCH 063/241] rebase of the patch --- debian/patches/python3-shebang.patch | 466 +++++++++++++-------------- 1 file changed, 228 insertions(+), 238 deletions(-) diff --git a/debian/patches/python3-shebang.patch b/debian/patches/python3-shebang.patch index 3e4d77f1..712b7fa3 100644 --- a/debian/patches/python3-shebang.patch +++ b/debian/patches/python3-shebang.patch @@ -1,769 +1,759 @@ 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_18~++20231020082810+f24d9490e560/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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 -*-=# # -Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/bindings/python/examples/cindex/cindex-dump.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/bindings/python/examples/cindex/cindex-dump.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/bindings/python/examples/cindex/cindex-dump.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/bindings/python/examples/cindex/cindex-dump.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/bindings/python/examples/cindex/cindex-dump.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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 -*--===# # -Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/bindings/python/examples/cindex/cindex-includes.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/bindings/python/examples/cindex/cindex-includes.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/bindings/python/examples/cindex/cindex-includes.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/bindings/python/examples/cindex/cindex-includes.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/bindings/python/examples/cindex/cindex-includes.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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 -*--===# # -Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/tools/scan-view/bin/scan-view +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/tools/scan-view/share/startfile.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/tools/scan-view/share/startfile.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/tools/scan-view/share/startfile.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/tools/scan-view/share/startfile.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/tools/scan-view/share/startfile.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/ABITest/ABITestGen.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/ABITest/ABITestGen.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/ABITest/ABITestGen.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/ABITest/ABITestGen.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/ABITest/ABITestGen.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/CIndex/completion_logger_server.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/CIndex/completion_logger_server.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/CIndex/completion_logger_server.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/CIndex/completion_logger_server.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/CIndex/completion_logger_server.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/CaptureCmd +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/CaptureCmd =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/CaptureCmd -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/CaptureCmd +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/CaptureCmd ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/CmpDriver +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/CmpDriver =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/CmpDriver -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/CmpDriver +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/CmpDriver ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/FindSpecRefs +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/FindSpecRefs =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/FindSpecRefs -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/FindSpecRefs +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/FindSpecRefs ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/FindSpecRefs @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import re -Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/FuzzTest +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/FuzzTest =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/FuzzTest -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/FuzzTest +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/FuzzTest ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/TestUtils/deep-stack.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/TestUtils/deep-stack.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/TestUtils/deep-stack.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/TestUtils/deep-stack.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/TestUtils/deep-stack.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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 -Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/CmpRuns.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/CmpRuns.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/analyzer/CmpRuns.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/CmpRuns.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/CmpRuns.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SATestAdd.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SATestAdd.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/analyzer/SATestAdd.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SATestAdd.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/SATestAdd.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SATestBuild.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SATestBuild.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/analyzer/SATestBuild.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SATestBuild.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/SATestBuild.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SATestUpdateDiffs.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SATestUpdateDiffs.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/analyzer/SATestUpdateDiffs.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SATestUpdateDiffs.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/SATestUpdateDiffs.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SumTimerInfo.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SumTimerInfo.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/analyzer/SumTimerInfo.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SumTimerInfo.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/SumTimerInfo.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/analyzer/exploded-graph-rewriter.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/exploded-graph-rewriter.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/analyzer/exploded-graph-rewriter.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/exploded-graph-rewriter.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/exploded-graph-rewriter.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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 -*--# # -Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/check_cfc/check_cfc.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/check_cfc/check_cfc.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/check_cfc/check_cfc.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/check_cfc/check_cfc.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/check_cfc/check_cfc.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/check_cfc/obj_diff.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/check_cfc/obj_diff.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/check_cfc/obj_diff.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/check_cfc/obj_diff.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/check_cfc/obj_diff.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/check_cfc/test_check_cfc.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/check_cfc/test_check_cfc.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/check_cfc/test_check_cfc.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/check_cfc/test_check_cfc.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/check_cfc/test_check_cfc.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/modfuzz.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/modfuzz.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/modfuzz.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/modfuzz.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/modfuzz.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/clang/utils/token-delta.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/token-delta.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/token-delta.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/token-delta.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/token-delta.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/compiler-rt/lib/asan/scripts/asan_symbolize.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/asan/scripts/asan_symbolize.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/compiler-rt/lib/asan/scripts/asan_symbolize.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/compiler-rt/lib/sanitizer_common/scripts/sancov.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/sanitizer_common/scripts/sancov.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/compiler-rt/lib/sanitizer_common/scripts/sancov.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/libcxx/utils/cat_files.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/libcxx/utils/cat_files.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/libcxx/utils/cat_files.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/libcxx/utils/cat_files.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/libcxx/utils/cat_files.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/libcxx/utils/generate_feature_test_macro_components.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/libcxx/utils/generate_feature_test_macro_components.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/libcxx/utils/generate_feature_test_macro_components.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/libcxx/utils/generate_feature_test_macro_components.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/libcxx/utils/generate_feature_test_macro_components.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/lld/utils/benchmark.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lld/utils/benchmark.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/lld/utils/benchmark.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lld/utils/benchmark.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lld/utils/benchmark.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/lldb/examples/python/file_extract.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/examples/python/file_extract.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/lldb/examples/python/file_extract.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/examples/python/file_extract.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/examples/python/file_extract.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/lldb/packages/Python/lldbsuite/test/bench.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/packages/Python/lldbsuite/test/bench.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/lldb/packages/Python/lldbsuite/test/bench.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/packages/Python/lldbsuite/test/bench.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/packages/Python/lldbsuite/test/bench.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/lldb/scripts/analyze-project-deps.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/scripts/analyze-project-deps.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/lldb/scripts/analyze-project-deps.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/scripts/analyze-project-deps.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/scripts/analyze-project-deps.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/lldb/scripts/verify_api.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/scripts/verify_api.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/lldb/scripts/verify_api.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/scripts/verify_api.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/scripts/verify_api.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/lldb/utils/lui/lui.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/utils/lui/lui.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/lldb/utils/lui/lui.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/utils/lui/lui.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/utils/lui/lui.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/lldb/utils/lui/sandbox.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/utils/lui/sandbox.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/lldb/utils/lui/sandbox.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/utils/lui/sandbox.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/utils/lui/sandbox.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/test/BugPoint/compile-custom.ll.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/test/BugPoint/compile-custom.ll.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/test/BugPoint/compile-custom.ll.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/test/BugPoint/compile-custom.ll.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/test/BugPoint/compile-custom.ll.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/test/Other/opt-bisect-helper.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/test/Other/opt-bisect-helper.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/test/Other/opt-bisect-helper.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/test/Other/opt-bisect-helper.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/test/Other/opt-bisect-helper.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/test/TableGen/JSON-check.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/test/TableGen/JSON-check.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/test/TableGen/JSON-check.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/test/TableGen/JSON-check.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/test/TableGen/JSON-check.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/opt-diff.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/opt-diff.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/tools/opt-viewer/opt-diff.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/opt-diff.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/tools/opt-viewer/opt-diff.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/opt-stats.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/opt-stats.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/tools/opt-viewer/opt-stats.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/opt-stats.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/tools/opt-viewer/opt-stats.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/opt-viewer.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/opt-viewer.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/tools/opt-viewer/opt-viewer.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/opt-viewer.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/tools/opt-viewer/opt-viewer.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/optrecord.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/optrecord.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/tools/opt-viewer/optrecord.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/optrecord.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/tools/opt-viewer/optrecord.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/Misc/zkill +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/Misc/zkill =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/Misc/zkill -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/Misc/zkill +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/Misc/zkill ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/Misc/zkill @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import re -Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/abtest.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/abtest.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/abtest.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/abtest.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/abtest.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/bisect +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/bisect =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/bisect -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/bisect +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/bisect ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/bisect-skip-count +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/bugpoint_gisel_reducer.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/bisect-skip-count -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/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_18~++20231020082810+f24d9490e560/llvm/utils/bugpoint_gisel_reducer.py -=================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/bugpoint_gisel_reducer.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/bugpoint_gisel_reducer.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/bugpoint_gisel_reducer.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/clang-parse-diagnostics-file +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/clang-parse-diagnostics-file =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/clang-parse-diagnostics-file -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/clang-parse-diagnostics-file +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/clang-parse-diagnostics-file ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/create_ladder_graph.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/create_ladder_graph.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/create_ladder_graph.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/create_ladder_graph.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/create_ladder_graph.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/extract_symbols.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/extract_symbols.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/extract_symbols.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/extract_symbols.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/extract_symbols.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/extract_vplan.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/extract_vplan.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/extract_vplan.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/extract_vplan.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/extract_vplan.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/indirect_calls.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/indirect_calls.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/indirect_calls.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/indirect_calls.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/indirect_calls.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/lit/lit/ProgressBar.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/lit/ProgressBar.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/lit/lit/ProgressBar.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/lit/ProgressBar.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/lit/ProgressBar.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/llvm-gisel-cov.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/llvm-gisel-cov.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/llvm-gisel-cov.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/llvm-gisel-cov.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/llvm-gisel-cov.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/prepare-code-coverage-artifact.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/prepare-code-coverage-artifact.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/prepare-code-coverage-artifact.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/prepare-code-coverage-artifact.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/prepare-code-coverage-artifact.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/release/findRegressions-nightly.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/release/findRegressions-nightly.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/release/findRegressions-nightly.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/release/findRegressions-nightly.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/release/findRegressions-nightly.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/release/findRegressions-simple.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/release/findRegressions-simple.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/release/findRegressions-simple.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/release/findRegressions-simple.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/release/findRegressions-simple.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/shuffle_fuzz.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/shuffle_fuzz.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/shuffle_fuzz.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/shuffle_fuzz.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/shuffle_fuzz.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/shuffle_select_fuzz_tester.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/shuffle_select_fuzz_tester.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/shuffle_select_fuzz_tester.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/shuffle_select_fuzz_tester.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/shuffle_select_fuzz_tester.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/sort_includes.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/sort_includes.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/sort_includes.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/sort_includes.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/sort_includes.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/unicode-case-fold.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/unicode-case-fold.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/unicode-case-fold.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/unicode-case-fold.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/unicode-case-fold.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_18~++20231020082810+f24d9490e560/llvm/utils/wciia.py +Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/wciia.py =================================================================== ---- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/wciia.py -+++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/wciia.py +--- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/wciia.py ++++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/wciia.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 From cce51c00b0df3405140dea4e0362b392300bfa8d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Mar 2024 18:27:46 +0100 Subject: [PATCH 064/241] Also install libMLIRExecutionEngineShared.so --- debian/changelog | 8 ++++++-- debian/libmlir-X.Y-dev.install.in | 1 + debian/libmlir-X.Y.install.in | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7388531b..61fab380 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp3) UNRELEASED; urgency=medium + [ Matthias Klose ] * Make libclang-common-19-dev architecture dependent. * Add python3-pexpect in the build dep for lldb. * Fix sanitizer build on 32bit time_t64 architectures. @@ -7,7 +8,10 @@ llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp2) UNRELEASED; * Build-depend on llvm-spirv-18 instead of llvm-spirv-17. * Add a stage1 profile to disable curl, grpc and spirv. - -- Matthias Klose Tue, 12 Mar 2024 12:54:07 +0100 + [ Sylvestre Ledru ] + * Also install libMLIRExecutionEngineShared.so + + -- Sylvestre Ledru Sat, 30 Mar 2024 18:27:15 +0100 llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp1) experimental; urgency=medium diff --git a/debian/libmlir-X.Y-dev.install.in b/debian/libmlir-X.Y-dev.install.in index 32297db0..f0cf3456 100644 --- a/debian/libmlir-X.Y-dev.install.in +++ b/debian/libmlir-X.Y-dev.install.in @@ -6,3 +6,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libMLIR.so usr/lib/llvm-@LLVM_VERSION@/lib/libMLIR*.a usr/lib/llvm-@LLVM_VERSION@/lib/libmlir*.so #usr/lib/llvm-@LLVM_VERSION@/lib/libmlir_*.a +usr/lib/llvm-@LLVM_VERSION@/lib/libMLIRExecutionEngineShared.so diff --git a/debian/libmlir-X.Y.install.in b/debian/libmlir-X.Y.install.in index 94175dc8..8867115e 100644 --- a/debian/libmlir-X.Y.install.in +++ b/debian/libmlir-X.Y.install.in @@ -1,2 +1,3 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libMLIR.so.* usr/lib/llvm-@LLVM_VERSION@/lib/libmlir*.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/libMLIRExecutionEngineShared.so.* From 432dc2710c5e3643b3032af02b16e9c4a7e09a87 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 5 Apr 2024 22:50:31 +0200 Subject: [PATCH 065/241] rebase of the patch --- .../23-strlcpy_strlcat_warning_removed.diff | 65 +++++++++---------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index d92cbd09..8f53b894 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,11 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/AST/Decl.cpp -@@ -4388,13 +4388,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/AST/Decl.cpp +@@ -4391,13 +4391,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -31,11 +31,11 @@ Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/Sema/SemaChecking.cpp -@@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/Sema/SemaChecking.cpp +@@ -1320,8 +1320,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memset_chk: @@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -7822,10 +7822,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -8126,10 +8126,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -59,30 +59,27 @@ Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -720,12 +720,12 @@ void GenericTaintChecker::initTaintRules +--- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules - {{CDM::CLibrary, {BI.getName(Builtin::BIstrncat)}}, + {{CDM::CLibraryMaybeHardened, {BI.getName(Builtin::BIstrncat)}}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, -- {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}}, -+/* {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}}, +- {{CDM::CLibraryMaybeHardened, {BI.getName(Builtin::BIstrlcpy)}}, ++/* {{CDM::CLibraryMaybeHardened, {BI.getName(Builtin::BIstrlcpy)}}, TR::Prop({{1, 2}}, {{0}})}, - {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcat)}}, + {{CDM::CLibraryMaybeHardened, {BI.getName(Builtin::BIstrlcat)}}, - TR::Prop({{1, 2}}, {{0}})}, + TR::Prop({{1, 2}}, {{0}})},*/ - {{CDM::CLibrary, {{"snprintf"}}}, -- TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, -+ TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, - {{CDM::CLibrary, {{"sprintf"}}}, - TR::Prop({{1}, 2}, {{0, ReturnValueIndex}})}, - {{CDM::CLibrary, {{"strcpy"}}}, TR::Prop({{1}}, {{0, ReturnValueIndex}})}, -Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/builtins.c + {{CDM::CLibraryMaybeHardened, {{"snprintf"}}}, + TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, + {{CDM::CLibraryMaybeHardened, {{"sprintf"}}}, +Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -114,10 +111,10 @@ Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -174,11 +171,11 @@ Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} -Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/include/clang/Basic/Builtins.td +Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/include/clang/Basic/Builtins.td =================================================================== ---- llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10.orig/clang/include/clang/Basic/Builtins.td -+++ llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/include/clang/Basic/Builtins.td -@@ -3254,7 +3254,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h +--- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/include/clang/Basic/Builtins.td +@@ -3262,7 +3262,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h // non-standard but very common @@ -188,7 +185,7 @@ Index: llvm-toolchain-snapshot_19~++20240312093436+2377beba8d10/clang/include/cl let Spellings = ["strlcpy"]; let Prototype = "size_t(char*, char const*, size_t)"; } -@@ -3263,6 +3264,7 @@ def StrlCat : GNULibBuiltin<"string.h"> +@@ -3271,6 +3272,7 @@ def StrlCat : GNULibBuiltin<"string.h"> let Spellings = ["strlcat"]; let Prototype = "size_t(char*, char const*, size_t)"; } From eca70a415099adfd5aa54dd41d28c1988e247be4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 20 Apr 2024 22:34:20 +0200 Subject: [PATCH 066/241] rebase of the patch --- debian/patches/lower-python-dep.diff | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index a778f721..8f7c00a4 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,14 +1,12 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240420103213+a3f07d36cbc9/llvm/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt -@@ -877,8 +877,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH - "Profiling data file to use when compiling in order to improve runtime performance.") +--- llvm-toolchain-snapshot_19~++20240420103213+a3f07d36cbc9.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240420103213+a3f07d36cbc9/llvm/CMakeLists.txt +@@ -904,7 +904,7 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH if(LLVM_INCLUDE_TESTS) -- # Lit test suite requires at least python 3.6 -- set(LLVM_MINIMUM_PYTHON_VERSION 3.6) -+ # Lit test suite requires at least python 3.5 + # All LLVM Python files should be compatible down to this minimum version. +- set(LLVM_MINIMUM_PYTHON_VERSION 3.8) + set(LLVM_MINIMUM_PYTHON_VERSION 3.5) else() # FIXME: it is unknown if this is the actual minimum bound From 561d3d954d096a0656969ccc1f5eee64afa19f5a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 21 Apr 2024 10:53:54 +0200 Subject: [PATCH 067/241] Revert "rebase of the patch" This reverts commit eca70a415099adfd5aa54dd41d28c1988e247be4. --- debian/patches/lower-python-dep.diff | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index 8f7c00a4..a778f721 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,12 +1,14 @@ -Index: llvm-toolchain-snapshot_19~++20240420103213+a3f07d36cbc9/llvm/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240420103213+a3f07d36cbc9.orig/llvm/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240420103213+a3f07d36cbc9/llvm/CMakeLists.txt -@@ -904,7 +904,7 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH +--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt +@@ -877,8 +877,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH + "Profiling data file to use when compiling in order to improve runtime performance.") if(LLVM_INCLUDE_TESTS) - # All LLVM Python files should be compatible down to this minimum version. -- set(LLVM_MINIMUM_PYTHON_VERSION 3.8) +- # Lit test suite requires at least python 3.6 +- set(LLVM_MINIMUM_PYTHON_VERSION 3.6) ++ # Lit test suite requires at least python 3.5 + set(LLVM_MINIMUM_PYTHON_VERSION 3.5) else() # FIXME: it is unknown if this is the actual minimum bound From 79ab58cffb8212ac526dc57b7f0fe99b7833fab3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 21 Apr 2024 14:14:27 +0200 Subject: [PATCH 068/241] Remove lang-to-external-fc to match upstream change in 4841d70a4b7d7cd8c492c16a9da339ec75bca135 --- debian/changelog | 6 ++++-- debian/flang-X.Y.install.in | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 61fab380..e10d9e69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp3) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp4) UNRELEASED; urgency=medium [ Matthias Klose ] * Make libclang-common-19-dev architecture dependent. @@ -10,8 +10,10 @@ llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp3) UNRELEASED; [ Sylvestre Ledru ] * Also install libMLIRExecutionEngineShared.so + * Remove lang-to-external-fc to match upstream change in + 4841d70a4b7d7cd8c492c16a9da339ec75bca135 - -- Sylvestre Ledru Sat, 30 Mar 2024 18:27:15 +0100 + -- Sylvestre Ledru Sun, 21 Apr 2024 14:14:09 +0200 llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp1) experimental; urgency=medium diff --git a/debian/flang-X.Y.install.in b/debian/flang-X.Y.install.in index ea5cafb0..2a57d2d4 100644 --- a/debian/flang-X.Y.install.in +++ b/debian/flang-X.Y.install.in @@ -1,14 +1,12 @@ usr/lib/llvm-@LLVM_VERSION@/bin/bbc usr/lib/llvm-@LLVM_VERSION@/bin/f18-parse-demo usr/lib/llvm-@LLVM_VERSION@/bin/fir-opt -usr/lib/llvm-@LLVM_VERSION@/bin/flang-to-external-fc usr/lib/llvm-@LLVM_VERSION@/bin/flang-new usr/lib/llvm-@LLVM_VERSION@/bin/tco usr/bin/bbc-@LLVM_VERSION@ usr/bin/f18-parse-demo-@LLVM_VERSION@ usr/bin/fir-opt-@LLVM_VERSION@ -usr/bin/flang-to-external-fc-@LLVM_VERSION@ usr/bin/flang-new-@LLVM_VERSION@ usr/bin/tco-@LLVM_VERSION@ From 160e0b59ff43604135f1ed174bdbb0c687f64aad Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 21 Apr 2024 14:21:55 +0200 Subject: [PATCH 069/241] prepare upload --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e10d9e69..63d63b93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp4) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp1) experimental; urgency=medium [ Matthias Klose ] * Make libclang-common-19-dev architecture dependent. @@ -9,11 +9,12 @@ llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp4) UNRELEASED; * Add a stage1 profile to disable curl, grpc and spirv. [ Sylvestre Ledru ] + * New snapshot release * Also install libMLIRExecutionEngineShared.so * Remove lang-to-external-fc to match upstream change in 4841d70a4b7d7cd8c492c16a9da339ec75bca135 - -- Sylvestre Ledru Sun, 21 Apr 2024 14:14:09 +0200 + -- Sylvestre Ledru Sun, 21 Apr 2024 14:21:37 +0200 llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp1) experimental; urgency=medium From 710e3307c796ef5899fb39f5880b86e514bb5575 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 23 Apr 2024 11:30:25 +0200 Subject: [PATCH 070/241] rebase of the patch --- debian/patches/openmp-fix-runtimes-build.diff | 62 +-- debian/patches/python3-shebang.patch | 460 +++++++++--------- 2 files changed, 256 insertions(+), 266 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 2cda5139..0690f57b 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_19~++20240323075423+39c8e87717fb/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/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_19~++20240323075423+39c8e87717fb/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/CMakeLists.txt -@@ -119,6 +119,28 @@ else() +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/CMakeLists.txt +@@ -129,6 +129,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/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_19~++20240323075423+39c8e87717fb/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/offload/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/cuda/CMakeLists.txt @@ -52,6 +52,8 @@ else() " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() @@ -67,13 +67,13 @@ Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptar +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) + # Install plugin under the lib destination folder. - install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") + install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}") set_target_properties(omptarget.rtl.cuda PROPERTIES -Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/libomptarget/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/src/CMakeLists.txt -@@ -43,6 +43,9 @@ add_llvm_library(omptarget +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/offload/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/src/CMakeLists.txt +@@ -49,6 +49,9 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY ) @@ -83,11 +83,11 @@ Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptar target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/runtime/CMakeLists.txt -@@ -318,6 +318,10 @@ if(LIBOMP_STATS) +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/CMakeLists.txt +@@ -323,6 +323,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -98,11 +98,11 @@ Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/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_19~++20240323075423+39c8e87717fb/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/runtime/src/CMakeLists.txt -@@ -144,6 +144,7 @@ set_source_files_properties(${LIBOMP_ASM +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/src/CMakeLists.txt +@@ -152,6 +152,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) @@ -110,7 +110,7 @@ Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/runtime/s else() set(LIBOMP_LINKER_LANGUAGE CXX) endif() -@@ -209,6 +210,8 @@ else() +@@ -217,6 +218,8 @@ else() ) endif() @@ -119,10 +119,10 @@ Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/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_19~++20240323075423+39c8e87717fb/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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) @@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) -Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/host/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb.orig/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptarget/plugins-nextgen/host/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/offload/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/host/CMakeLists.txt @@ -31,6 +31,8 @@ else() target_include_directories(omptarget.rtl.${machine} PRIVATE dynamic_ffi) endif() @@ -145,4 +145,4 @@ Index: llvm-toolchain-snapshot_19~++20240323075423+39c8e87717fb/openmp/libomptar + # Install plugin under the lib destination folder. install(TARGETS omptarget.rtl.${machine} - LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") + LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}") diff --git a/debian/patches/python3-shebang.patch b/debian/patches/python3-shebang.patch index 712b7fa3..cd09b795 100644 --- a/debian/patches/python3-shebang.patch +++ b/debian/patches/python3-shebang.patch @@ -1,759 +1,749 @@ 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_19~++20240326093010+6a6f9bf38e65/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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 -*-=# # -Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/bindings/python/examples/cindex/cindex-dump.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/bindings/python/examples/cindex/cindex-dump.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/bindings/python/examples/cindex/cindex-dump.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/bindings/python/examples/cindex/cindex-dump.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/bindings/python/examples/cindex/cindex-dump.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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 -*--===# # -Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/bindings/python/examples/cindex/cindex-includes.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/bindings/python/examples/cindex/cindex-includes.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/bindings/python/examples/cindex/cindex-includes.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/bindings/python/examples/cindex/cindex-includes.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/bindings/python/examples/cindex/cindex-includes.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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 -*--===# # -Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/tools/scan-view/bin/scan-view +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/tools/scan-view/share/startfile.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/tools/scan-view/share/startfile.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/tools/scan-view/share/startfile.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/tools/scan-view/share/startfile.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/tools/scan-view/share/startfile.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/ABITest/ABITestGen.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/ABITest/ABITestGen.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/ABITest/ABITestGen.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/ABITest/ABITestGen.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/ABITest/ABITestGen.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/CIndex/completion_logger_server.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/CIndex/completion_logger_server.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/CIndex/completion_logger_server.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/CIndex/completion_logger_server.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/CIndex/completion_logger_server.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/CaptureCmd +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/CaptureCmd =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/CaptureCmd -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/CaptureCmd +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/CaptureCmd ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/CmpDriver +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/CmpDriver =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/CmpDriver -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/CmpDriver +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/CmpDriver ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/FindSpecRefs +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/FindSpecRefs =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/FindSpecRefs -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/FindSpecRefs +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/FindSpecRefs ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/FindSpecRefs @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import re -Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/FuzzTest +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/FuzzTest =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/FuzzTest -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/FuzzTest +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/FuzzTest ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/TestUtils/deep-stack.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/TestUtils/deep-stack.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/TestUtils/deep-stack.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/TestUtils/deep-stack.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/TestUtils/deep-stack.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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 -Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/CmpRuns.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/analyzer/CmpRuns.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/CmpRuns.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/CmpRuns.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/analyzer/CmpRuns.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SATestAdd.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/analyzer/SATestAdd.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/SATestAdd.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SATestAdd.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/analyzer/SATestAdd.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SATestBuild.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/analyzer/SATestBuild.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/SATestBuild.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SATestBuild.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/analyzer/SATestBuild.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SATestUpdateDiffs.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/analyzer/SATestUpdateDiffs.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/SATestUpdateDiffs.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SATestUpdateDiffs.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/analyzer/SATestUpdateDiffs.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SumTimerInfo.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/analyzer/SumTimerInfo.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/SumTimerInfo.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/SumTimerInfo.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/analyzer/SumTimerInfo.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/exploded-graph-rewriter.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/analyzer/exploded-graph-rewriter.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/analyzer/exploded-graph-rewriter.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/analyzer/exploded-graph-rewriter.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/analyzer/exploded-graph-rewriter.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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 -*--# # -Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/check_cfc/check_cfc.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/check_cfc/check_cfc.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/check_cfc/check_cfc.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/check_cfc/check_cfc.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/check_cfc/check_cfc.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/check_cfc/obj_diff.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/check_cfc/obj_diff.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/check_cfc/obj_diff.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/check_cfc/obj_diff.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/check_cfc/obj_diff.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/check_cfc/test_check_cfc.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/check_cfc/test_check_cfc.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/check_cfc/test_check_cfc.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/check_cfc/test_check_cfc.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/check_cfc/test_check_cfc.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/modfuzz.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/modfuzz.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/modfuzz.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/modfuzz.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/modfuzz.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/clang/utils/token-delta.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/clang/utils/token-delta.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/clang/utils/token-delta.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/clang/utils/token-delta.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/clang/utils/token-delta.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/asan/scripts/asan_symbolize.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/compiler-rt/lib/asan/scripts/asan_symbolize.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/asan/scripts/asan_symbolize.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/sanitizer_common/scripts/sancov.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/compiler-rt/lib/sanitizer_common/scripts/sancov.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/compiler-rt/lib/sanitizer_common/scripts/sancov.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/libcxx/utils/cat_files.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/libcxx/utils/cat_files.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/libcxx/utils/cat_files.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/libcxx/utils/cat_files.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/libcxx/utils/cat_files.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/libcxx/utils/generate_feature_test_macro_components.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/libcxx/utils/generate_feature_test_macro_components.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/libcxx/utils/generate_feature_test_macro_components.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/libcxx/utils/generate_feature_test_macro_components.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/libcxx/utils/generate_feature_test_macro_components.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/lld/utils/benchmark.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/lld/utils/benchmark.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lld/utils/benchmark.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lld/utils/benchmark.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/lld/utils/benchmark.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/lldb/examples/python/file_extract.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/lldb/examples/python/file_extract.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/examples/python/file_extract.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/examples/python/file_extract.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/lldb/examples/python/file_extract.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/lldb/packages/Python/lldbsuite/test/bench.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/lldb/packages/Python/lldbsuite/test/bench.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/packages/Python/lldbsuite/test/bench.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/packages/Python/lldbsuite/test/bench.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/lldb/packages/Python/lldbsuite/test/bench.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/lldb/scripts/analyze-project-deps.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/lldb/scripts/analyze-project-deps.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/scripts/analyze-project-deps.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/scripts/analyze-project-deps.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/lldb/scripts/analyze-project-deps.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/lldb/scripts/verify_api.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/lldb/scripts/verify_api.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/scripts/verify_api.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/scripts/verify_api.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/lldb/scripts/verify_api.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/lldb/utils/lui/lui.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/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_19~++20240326093010+6a6f9bf38e65/lldb/utils/lui/lui.py -=================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/utils/lui/lui.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/utils/lui/lui.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/lldb/utils/lui/lui.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/lldb/utils/lui/sandbox.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/lldb/utils/lui/sandbox.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/lldb/utils/lui/sandbox.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/lldb/utils/lui/sandbox.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/lldb/utils/lui/sandbox.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/test/BugPoint/compile-custom.ll.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/test/BugPoint/compile-custom.ll.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/test/BugPoint/compile-custom.ll.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/test/BugPoint/compile-custom.ll.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/test/BugPoint/compile-custom.ll.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/test/Other/opt-bisect-helper.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/test/Other/opt-bisect-helper.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/test/Other/opt-bisect-helper.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/test/Other/opt-bisect-helper.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/test/Other/opt-bisect-helper.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/test/TableGen/JSON-check.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/test/TableGen/JSON-check.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/test/TableGen/JSON-check.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/test/TableGen/JSON-check.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/test/TableGen/JSON-check.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/opt-diff.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/tools/opt-viewer/opt-diff.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/tools/opt-viewer/opt-diff.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/opt-diff.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/tools/opt-viewer/opt-diff.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/opt-stats.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/tools/opt-viewer/opt-stats.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/tools/opt-viewer/opt-stats.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/opt-stats.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/tools/opt-viewer/opt-stats.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/opt-viewer.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/tools/opt-viewer/opt-viewer.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/tools/opt-viewer/opt-viewer.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/opt-viewer.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/tools/opt-viewer/opt-viewer.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/optrecord.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/tools/opt-viewer/optrecord.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/tools/opt-viewer/optrecord.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/tools/opt-viewer/optrecord.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/tools/opt-viewer/optrecord.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/Misc/zkill +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/Misc/zkill =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/Misc/zkill -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/Misc/zkill +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/Misc/zkill ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/Misc/zkill @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import re -Index: llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/abtest.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/abtest.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/abtest.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/abtest.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/abtest.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/bisect +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/bisect =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/bisect -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/bisect +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/bisect ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/bugpoint_gisel_reducer.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/bugpoint_gisel_reducer.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/bugpoint_gisel_reducer.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/bugpoint_gisel_reducer.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/bugpoint_gisel_reducer.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/clang-parse-diagnostics-file +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/clang-parse-diagnostics-file =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/clang-parse-diagnostics-file -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/clang-parse-diagnostics-file +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/clang-parse-diagnostics-file ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/create_ladder_graph.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/create_ladder_graph.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/create_ladder_graph.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/create_ladder_graph.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/create_ladder_graph.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/extract_symbols.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/extract_symbols.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/extract_symbols.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/extract_symbols.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/extract_symbols.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/extract_vplan.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/extract_vplan.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/extract_vplan.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/extract_vplan.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/extract_vplan.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/indirect_calls.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/indirect_calls.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/indirect_calls.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/indirect_calls.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/indirect_calls.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/lit/ProgressBar.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/lit/lit/ProgressBar.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/lit/ProgressBar.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/lit/ProgressBar.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/lit/lit/ProgressBar.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/llvm-gisel-cov.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/llvm-gisel-cov.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/llvm-gisel-cov.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/llvm-gisel-cov.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/llvm-gisel-cov.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/prepare-code-coverage-artifact.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/prepare-code-coverage-artifact.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/prepare-code-coverage-artifact.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/prepare-code-coverage-artifact.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/prepare-code-coverage-artifact.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/release/findRegressions-nightly.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/release/findRegressions-nightly.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/release/findRegressions-nightly.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/release/findRegressions-nightly.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/release/findRegressions-nightly.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/release/findRegressions-simple.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/release/findRegressions-simple.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/release/findRegressions-simple.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/release/findRegressions-simple.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/release/findRegressions-simple.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/shuffle_fuzz.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/shuffle_fuzz.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/shuffle_fuzz.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/shuffle_fuzz.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/shuffle_fuzz.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/shuffle_select_fuzz_tester.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/shuffle_select_fuzz_tester.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/shuffle_select_fuzz_tester.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/shuffle_select_fuzz_tester.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/shuffle_select_fuzz_tester.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/sort_includes.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/sort_includes.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/sort_includes.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/sort_includes.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/sort_includes.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/unicode-case-fold.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/unicode-case-fold.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/unicode-case-fold.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/unicode-case-fold.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/unicode-case-fold.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240326093010+6a6f9bf38e65/llvm/utils/wciia.py +Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/wciia.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65.orig/llvm/utils/wciia.py -+++ llvm-toolchain-snapshot_19~++20240326093010+6a6f9bf38e65/llvm/utils/wciia.py +--- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/utils/wciia.py ++++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/utils/wciia.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 From 8fd14767608859fa9b77e888e3d30cab13a5197b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Apr 2024 09:58:18 +0200 Subject: [PATCH 071/241] rebase of the patches --- ...e-Debian-provided-MathJax-everywhere.patch | 44 +++++++++---------- debian/patches/D148945-revert.diff | 8 ++-- .../clang-arm-default-vfp3-on-armv7a.patch | 34 +++++++------- ...pilerrt-build-scudo-standalone-option.diff | 8 ++-- debian/patches/force-sse2-compiler-rt.diff | 8 ++-- .../libclc-fix-prepare_builtins-rpath.diff | 8 ++-- debian/patches/lower-python-dep.diff | 8 ++-- debian/patches/mips/D154390-pre-R6.diff | 10 ++--- debian/patches/omp-riscv64.patch | 8 ++-- debian/patches/revert-update-doc.diff | 42 +++++++++--------- debian/patches/unbreak-atomic-mips.diff | 8 ++-- .../wasm/wasm-compiler-rt-default.diff | 16 +++---- debian/patches/wasm/wasm-sysroot-usr.diff | 26 +++++------ 13 files changed, 114 insertions(+), 114 deletions(-) diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch index 9e137ac9..b0f6e7d8 100644 --- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch +++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch @@ -13,10 +13,10 @@ Subject: Use Debian-provided MathJax everywhere. polly/docs/doxygen.cfg.in | 2 +- 8 files changed, 14 insertions(+), 5 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py @@ -119,6 +119,9 @@ html_theme = "haiku" # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ["_static"] @@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extr # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. # html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang-tools-extra/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang-tools-extra/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/doxygen.cfg.in @@ -1443,7 +1443,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extr # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/analyzer/conf.py @@ -120,6 +120,9 @@ html_theme = "haiku" # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -54,11 +54,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analy # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. # html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py -@@ -120,6 +120,9 @@ html_theme = "haiku" +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py +@@ -129,6 +129,9 @@ html_theme = "haiku" # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -68,10 +68,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf. # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. # html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/doxygen.cfg.in @@ -1432,7 +1432,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/doxyg # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/doxyge # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/polly/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/polly/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/polly/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. diff --git a/debian/patches/D148945-revert.diff b/debian/patches/D148945-revert.diff index 4deb3b72..871be9a2 100644 --- a/debian/patches/D148945-revert.diff +++ b/debian/patches/D148945-revert.diff @@ -3,11 +3,11 @@ Restore that for now, we're not GenToo ... https://reviews.llvm.org/D148945 https://reviews.llvm.org/D122444 -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/Linux.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Linux.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp -@@ -337,6 +337,13 @@ Linux::Linux(const Driver &D, const llvm +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/Linux.cpp +@@ -345,6 +345,13 @@ Linux::Linux(const Driver &D, const llvm Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch index be9dac40..ec5a1211 100644 --- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch +++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch @@ -1,21 +1,7 @@ -Index: llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/lib/Target/ARM/ARM.td +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/include/llvm/TargetParser/ARMTargetParser.def =================================================================== ---- llvm-toolchain-snapshot_19~++20240303093231+800de14fab13.orig/llvm/lib/Target/ARM/ARM.td -+++ llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/lib/Target/ARM/ARM.td -@@ -914,7 +914,8 @@ def ARMv6sm : Architecture<"armv6s-m", - FeatureStrictAlign]>; - - def ARMv7a : Architecture<"armv7-a", "ARMv7a", [HasV7Ops, -- FeatureNEON, -+ FeatureVFP3, -+ FeatureVFP3_D16, - FeatureDB, - FeatureDSP, - FeatureAClass, -Index: llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/include/llvm/TargetParser/ARMTargetParser.def -=================================================================== ---- llvm-toolchain-snapshot_19~++20240303093231+800de14fab13.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def -+++ llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/include/llvm/TargetParser/ARMTargetParser.def +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/include/llvm/TargetParser/ARMTargetParser.def @@ -92,8 +92,8 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "+v6 FK_VFPV2, (ARM::AEK_SEC | ARM::AEK_DSP)) ARM_ARCH("armv6-m", ARMV6M, "6-M", "+v6m", ARMBuildAttrs::CPUArch::v6_M, @@ -27,3 +13,17 @@ Index: llvm-toolchain-snapshot_19~++20240303093231+800de14fab13/llvm/include/llv ARM_ARCH("armv7ve", ARMV7VE, "7VE", "+v7ve", ARMBuildAttrs::CPUArch::v7, FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM | +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/lib/Target/ARM/ARMArchitectures.td +=================================================================== +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/lib/Target/ARM/ARMArchitectures.td ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/lib/Target/ARM/ARMArchitectures.td +@@ -42,7 +42,8 @@ def ARMv6sm : Architecture<"armv6s-m", + FeatureStrictAlign]>; + + def ARMv7a : Architecture<"armv7-a", "ARMv7a", [HasV7Ops, +- FeatureNEON, ++ FeatureVFP3, ++ FeatureVFP3_D16, + FeatureDB, + FeatureDSP, + FeatureAClass, diff --git a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff index 6d8840cc..bcb1c397 100644 --- a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff +++ b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff @@ -1,10 +1,10 @@ add option to disable compiler-rt scudo standalone allocator as it is not always supported by all arch profiles such as arm5vt of ARM32 arch -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/CMakeLists.txt -@@ -282,6 +282,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/CMakeLists.txt +@@ -285,6 +285,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY include(config-ix) diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index ce70bb99..0cf1fb0b 100644 --- a/debian/patches/force-sse2-compiler-rt.diff +++ b/debian/patches/force-sse2-compiler-rt.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/builtins/CMakeLists.txt -@@ -772,6 +772,12 @@ else () +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/builtins/CMakeLists.txt +@@ -773,6 +773,12 @@ else () append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() diff --git a/debian/patches/libclc-fix-prepare_builtins-rpath.diff b/debian/patches/libclc-fix-prepare_builtins-rpath.diff index 8ee965f8..e4cb134c 100644 --- a/debian/patches/libclc-fix-prepare_builtins-rpath.diff +++ b/debian/patches/libclc-fix-prepare_builtins-rpath.diff @@ -1,10 +1,10 @@ set rpath for prepare_builtins build utility to find correct stage2 libs at runtime when executed as part of a build -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libclc/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/libclc/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libclc/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libclc/CMakeLists.txt -@@ -121,6 +121,9 @@ add_llvm_executable( prepare_builtins ut +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/libclc/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/libclc/CMakeLists.txt +@@ -171,6 +171,9 @@ endif() target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) # These were not properly reported in early LLVM and we don't need them target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index a778f721..c9508ff9 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/CMakeLists.txt -@@ -877,8 +877,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/CMakeLists.txt +@@ -903,8 +903,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH "Profiling data file to use when compiling in order to improve runtime performance.") if(LLVM_INCLUDE_TESTS) diff --git a/debian/patches/mips/D154390-pre-R6.diff b/debian/patches/mips/D154390-pre-R6.diff index f311b6e9..e31d8078 100644 --- a/debian/patches/mips/D154390-pre-R6.diff +++ b/debian/patches/mips/D154390-pre-R6.diff @@ -1,10 +1,10 @@ see https://reviews.llvm.org/D158491, still unreviewed upstream -Index: llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/sanitizer_common/sanitizer_asm.h =================================================================== ---- llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -+++ llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -@@ -44,6 +44,8 @@ +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +@@ -54,6 +54,8 @@ #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__) # define ASM_TAIL_CALL jmp @@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc/compiler-rt/lib/ #elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ defined(__powerpc__) || defined(__loongarch_lp64) # define ASM_TAIL_CALL b -@@ -76,6 +78,25 @@ +@@ -86,6 +88,25 @@ SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " i_func #endif diff --git a/debian/patches/omp-riscv64.patch b/debian/patches/omp-riscv64.patch index 9a31b8b2..bbdf8668 100644 --- a/debian/patches/omp-riscv64.patch +++ b/debian/patches/omp-riscv64.patch @@ -1,11 +1,11 @@ Description: Define the affinity for riscv64 Last-Update: 2021-08-27 -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/kmp_affinity.h +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/openmp/runtime/src/kmp_affinity.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/src/kmp_affinity.h -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/src/kmp_affinity.h -@@ -220,6 +220,17 @@ public: +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/openmp/runtime/src/kmp_affinity.h ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/openmp/runtime/src/kmp_affinity.h +@@ -221,6 +221,17 @@ public: #elif __NR_sched_getaffinity != 123 #error Wrong code for getaffinity system call. #endif /* __NR_sched_getaffinity */ diff --git a/debian/patches/revert-update-doc.diff b/debian/patches/revert-update-doc.diff index bd8e55b8..1f6e9b21 100644 --- a/debian/patches/revert-update-doc.diff +++ b/debian/patches/revert-update-doc.diff @@ -15,10 +15,10 @@ Date: Tue Feb 1 23:13:01 2022 -0800 Differential Revision: https://reviews.llvm.org/D112181 -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extra/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py @@ -44,6 +44,15 @@ master_doc = "index" project = "Extra Clang Tools" copyright = "2007-%d, The Clang Team" % date.today().year @@ -47,11 +47,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang-tools-extr # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py -@@ -48,6 +48,15 @@ master_doc = "index" +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py +@@ -57,6 +57,15 @@ master_doc = "index" project = "Clang" copyright = "2007-%d, The Clang Team" % date.today().year @@ -67,7 +67,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf. # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -@@ -79,11 +88,6 @@ exclude_patterns = ["_build"] +@@ -88,11 +97,6 @@ exclude_patterns = ["_build"] # The name of the Pygments (syntax highlighting) style to use. pygments_style = "friendly" @@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf. # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lld/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/lld/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lld/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lld/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/lld/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/lld/docs/conf.py @@ -43,6 +43,15 @@ master_doc = "index" project = "lld" copyright = "2011-%d, LLVM Project" % date.today().year @@ -99,10 +99,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lld/docs/conf.py # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/cmake/modules/AddSphinxTarget.cmake +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/cmake/modules/AddSphinxTarget.cmake =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/cmake/modules/AddSphinxTarget.cmake -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/cmake/modules/AddSphinxTarget.cmake +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/cmake/modules/AddSphinxTarget.cmake ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/cmake/modules/AddSphinxTarget.cmake @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") endif() @@ -124,11 +124,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/cmake/modul ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested "${ARG_SOURCE_DIR}" # Source "${SPHINX_BUILD_DIR}" # Output -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/conf.py -@@ -52,6 +52,15 @@ master_doc = "index" +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/conf.py +@@ -63,6 +63,15 @@ master_doc = "index" project = "LLVM" copyright = "2003-%d, LLVM Project" % date.today().year @@ -144,10 +144,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/docs/conf.p # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/polly/docs/conf.py @@ -44,6 +44,15 @@ master_doc = "index" project = "Polly" copyright = "2010-%d, The Polly Team" % date.today().year diff --git a/debian/patches/unbreak-atomic-mips.diff b/debian/patches/unbreak-atomic-mips.diff index a998444d..f5d0cab3 100644 --- a/debian/patches/unbreak-atomic-mips.diff +++ b/debian/patches/unbreak-atomic-mips.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/scudo/standalone/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/scudo/standalone/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/scudo/standalone/CMakeLists.txt -@@ -194,6 +194,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/scudo/standalone/CMakeLists.txt +@@ -195,6 +195,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH list(APPEND SCUDO_LINK_LIBS atomic) endif() diff --git a/debian/patches/wasm/wasm-compiler-rt-default.diff b/debian/patches/wasm/wasm-compiler-rt-default.diff index 70ce1aa6..18f5bdf9 100644 --- a/debian/patches/wasm/wasm-compiler-rt-default.diff +++ b/debian/patches/wasm/wasm-compiler-rt-default.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.cpp -@@ -393,6 +393,18 @@ ToolChain::RuntimeLibType WebAssembly::G +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -421,6 +421,18 @@ ToolChain::RuntimeLibType WebAssembly::G return ToolChain::RLT_CompilerRT; } @@ -21,11 +21,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver ToolChain::CXXStdlibType WebAssembly::GetCXXStdlibType(const ArgList &Args) const { if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) { -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h -@@ -60,6 +60,7 @@ private: +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h +@@ -56,6 +56,7 @@ private: llvm::opt::ArgStringList &CC1Args, Action::OffloadKind DeviceOffloadKind) const override; RuntimeLibType GetDefaultRuntimeLibType() const override; diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff index b0f4ec28..d144faf5 100644 --- a/debian/patches/wasm/wasm-sysroot-usr.diff +++ b/debian/patches/wasm/wasm-sysroot-usr.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.cpp -@@ -200,7 +200,7 @@ WebAssembly::WebAssembly(const Driver &D +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -222,7 +222,7 @@ WebAssembly::WebAssembly(const Driver &D getProgramPaths().push_back(getDriver().Dir); @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver if (getTriple().getOS() == llvm::Triple::UnknownOS) { // Theoretically an "unknown" OS should mean no standard libraries, however // it could also mean that a custom set of libraries is in use, so just add -@@ -426,6 +426,7 @@ void WebAssembly::AddClangSystemIncludeA +@@ -454,6 +454,7 @@ void WebAssembly::AddClangSystemIncludeA return; const Driver &D = getDriver(); @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { SmallString<128> P(D.ResourceDir); -@@ -449,12 +450,20 @@ void WebAssembly::AddClangSystemIncludeA +@@ -477,12 +478,20 @@ void WebAssembly::AddClangSystemIncludeA return; } @@ -43,7 +43,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver } void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, -@@ -505,6 +514,17 @@ Tool *WebAssembly::buildLinker() const { +@@ -533,6 +542,17 @@ Tool *WebAssembly::buildLinker() const { return new tools::wasm::Linker(*this); } @@ -61,7 +61,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver void WebAssembly::addLibCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { -@@ -515,18 +535,22 @@ void WebAssembly::addLibCxxIncludePaths( +@@ -543,18 +563,22 @@ void WebAssembly::addLibCxxIncludePaths( getMultiarchTriple(D, getTriple(), SysRoot); bool IsKnownOs = (getTriple().getOS() != llvm::Triple::UnknownOS); @@ -91,7 +91,7 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver } void WebAssembly::addLibStdCXXIncludePaths( -@@ -573,8 +597,11 @@ void WebAssembly::addLibStdCXXIncludePat +@@ -601,8 +625,11 @@ void WebAssembly::addLibStdCXXIncludePat addSystemInclude(DriverArgs, CC1Args, TargetDir); } @@ -107,11 +107,11 @@ Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver + addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward"); + } } -Index: llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_19~++20240304085905+c7fdd8c11e54/clang/lib/Driver/ToolChains/WebAssembly.h -@@ -88,6 +88,8 @@ private: +--- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h +@@ -84,6 +84,8 @@ private: llvm::opt::ArgStringList &CC1Args) const; void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const; From b641b1b38d3cb023d4150cb01efe297ffedffd47 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Apr 2024 13:44:22 +0200 Subject: [PATCH 072/241] adjust the patch after 4ec9a662d388db8a2bb862dbaa7fc3fd809d1240 --- debian/patches/D148945-revert.diff | 2 +- debian/patches/kfreebsd/kfreebsd-triple-clang.diff | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/D148945-revert.diff b/debian/patches/D148945-revert.diff index 871be9a2..b91ddb59 100644 --- a/debian/patches/D148945-revert.diff +++ b/debian/patches/D148945-revert.diff @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver + // The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs + // libc++.so in D.Dir+"/../lib/". Detect this path. + // TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported. -+ if (StringRef(D.Dir).startswith(SysRoot) && ++ if (StringRef(D.Dir).starts_with(SysRoot) && + D.getVFS().exists(D.Dir + "/../lib/libc++.so")) + addPathIfExists(D, D.Dir + "/../lib", Paths); + diff --git a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff index 56657daf..f8de7bf5 100644 --- a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff +++ b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff @@ -266,7 +266,7 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/T + // the cross. Note that GCC does include some of these directories in some + // configurations but this seems somewhere between questionable and simply + // a bug. -+ if (StringRef(LibPath).startswith(SysRoot)) { ++ if (StringRef(LibPath).starts_with(SysRoot)) { + addPathIfExists(D, LibPath + "/" + MultiarchTriple, Paths); + addPathIfExists(D, LibPath + "/../" + OSLibDir, Paths); + } @@ -277,7 +277,7 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/T + // those searched. + // FIXME: It's not clear whether we should use the driver's installed + // directory ('Dir' below) or the ResourceDir. -+ if (StringRef(D.Dir).startswith(SysRoot)) { ++ if (StringRef(D.Dir).starts_with(SysRoot)) { + addPathIfExists(D, D.Dir + "/../lib/" + MultiarchTriple, Paths); + addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths); + } @@ -315,7 +315,7 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/T + + // See comments above on the multilib variant for details of why this is + // only included from within the sysroot. -+ if (StringRef(LibPath).startswith(SysRoot)) ++ if (StringRef(LibPath).starts_with(SysRoot)) + addPathIfExists(D, LibPath, Paths); + } + @@ -324,7 +324,7 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/T + // searched. + // FIXME: It's not clear whether we should use the driver's installed + // directory ('Dir' below) or the ResourceDir. -+ if (StringRef(D.Dir).startswith(SysRoot)) ++ if (StringRef(D.Dir).starts_with(SysRoot)) + addPathIfExists(D, D.Dir + "/../lib", Paths); + + addPathIfExists(D, SysRoot + "/lib", Paths); From f76549936a2688b8438db996ea79878dae73f514 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Apr 2024 14:55:28 +0200 Subject: [PATCH 073/241] after upstream 330d8983d25d08580fc1642fea48b2473f47a9da adjust the RUNTIMES build to include offload (was openmp/libomptarget) --- debian/changelog | 7 +++++++ debian/rules | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 63d63b93..5001054a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental; urgency=medium + + * after upstream 330d8983d25d08580fc1642fea48b2473f47a9da + adjust the RUNTIMES build to include offload (was openmp/libomptarget) + + -- Sylvestre Ledru Fri, 26 Apr 2024 14:55:20 +0200 + llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp1) experimental; urgency=medium [ Matthias Klose ] diff --git a/debian/rules b/debian/rules index a63d8859..b895c336 100755 --- a/debian/rules +++ b/debian/rules @@ -377,7 +377,8 @@ OPENMP_ENABLE=yes ifneq (,$(filter $(DEB_HOST_ARCH), m68k mipsel powerpc powerpcspe sparc64 s390x x32)) OPENMP_ENABLE=no else - PROJECTS+=;openmp + PROJECTS += ;openmp + RUNTIMES += ;offload STAGE_ALL_CMAKE_EXTRA += -DLIBOMP_LIBFLAGS="-lm" ifeq ($(LIBUNWIND_ENABLE),yes) STAGE_ALL_CMAKE_EXTRA += -DOPENMP_USE_LLVM_UNWINDER=ON From 3d7c7a2a79fb4d8766b76434268d0f4b2f3f4788 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Apr 2024 00:59:14 +0200 Subject: [PATCH 074/241] rebase of the patches --- debian/patches/openmp-fix-runtimes-build.diff | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 0690f57b..1b63db22 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_19~++20240423112228+dbcfb434a9c7/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240423112228+dbcfb434a9c7/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/CMakeLists.txt @@ -129,6 +129,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/offload/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/cuda/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/cuda/CMakeLists.txt @@ -52,6 +52,8 @@ else() " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() @@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins- # Install plugin under the lib destination folder. install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}") set_target_properties(omptarget.rtl.cuda PROPERTIES -Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/offload/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/src/CMakeLists.txt @@ -49,6 +49,9 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY @@ -83,10 +83,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/src/CMak target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/CMakeLists.txt @@ -323,6 +323,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -98,10 +98,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240423112228+dbcfb434a9c7/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/src/CMakeLists.txt @@ -152,6 +152,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -119,10 +119,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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_19~++20240423112228+dbcfb434a9c7/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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) @@ -133,16 +133,16 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) -Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/host/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/host/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/offload/plugins-nextgen/host/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/host/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/host/CMakeLists.txt @@ -31,6 +31,8 @@ else() - target_include_directories(omptarget.rtl.${machine} PRIVATE dynamic_ffi) + target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) endif() +add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") + # Install plugin under the lib destination folder. - install(TARGETS omptarget.rtl.${machine} + install(TARGETS omptarget.rtl.host LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}") From b881926a845b5635d34b3c10399dd8e4f4cf5759 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 30 Apr 2024 11:42:18 +0200 Subject: [PATCH 075/241] rebase of the patches --- debian/patches/lldb/lldb-soname.diff | 16 +++--- debian/patches/openmp-fix-runtimes-build.diff | 56 ++++++++++--------- 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff index 908a7e5f..e4ac1452 100644 --- a/debian/patches/lldb/lldb-soname.diff +++ b/debian/patches/lldb/lldb-soname.diff @@ -2,13 +2,13 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/CMakeLists.txt -@@ -20,7 +20,12 @@ if(LLDB_ENABLE_LUA) - set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp) - endif() +--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/CMakeLists.txt +@@ -24,7 +24,12 @@ lldb_tablegen(../../include/lldb/API/SBL + SOURCE ${LLVM_MAIN_INCLUDE_DIR}/llvm/BinaryFormat/Dwarf.def + TARGET lldb-sbapi-dwarf-enums) -add_lldb_library(liblldb SHARED ${option_framework} +set(output_name lldb) @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/ SBAddress.cpp SBAttachInfo.cpp SBBlock.cpp -@@ -169,7 +174,7 @@ endif() +@@ -176,7 +181,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/API/ ) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) -@@ -235,12 +240,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) +@@ -242,12 +247,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 1b63db22..87bcbeae 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_19~++20240426113138+3d5e9ab6d89b/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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_19~++20240426113138+3d5e9ab6d89b/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/CMakeLists.txt @@ -129,6 +129,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/cuda/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/cuda/CMakeLists.txt @@ -52,6 +52,8 @@ else() " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() @@ -69,24 +69,26 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins- # Install plugin under the lib destination folder. install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}") set_target_properties(omptarget.rtl.cuda PROPERTIES -Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/src/CMakeLists.txt -@@ -49,6 +49,9 @@ add_llvm_library(omptarget +--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMakeLists.txt +@@ -50,7 +50,10 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY ) +-target_include_directories(omptarget PRIVATE + +add_runtimes_build_depends_if_needed(omptarget) + - target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) ++target_include_directories(omptarget PRIVATE + ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR} + ) - if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/CMakeLists.txt @@ -323,6 +323,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -98,10 +100,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/src/CMakeLists.txt @@ -152,6 +152,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -119,10 +121,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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_19~++20240426113138+3d5e9ab6d89b/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/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) @@ -133,10 +135,10 @@ Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) -Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/host/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/host/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/plugins-nextgen/host/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/host/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/host/CMakeLists.txt @@ -31,6 +31,8 @@ else() target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) endif() From 334f4f7736e390a535750ffcc1377d2c3437a0ae Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 1 May 2024 15:51:14 +0200 Subject: [PATCH 076/241] try to build with LLVM_LIBC_GPU_BUILD --- debian/changelog | 1 + debian/rules | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5001054a..e963eb8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental * after upstream 330d8983d25d08580fc1642fea48b2473f47a9da adjust the RUNTIMES build to include offload (was openmp/libomptarget) + * try to build with LLVM_LIBC_GPU_BUILD -- Sylvestre Ledru Fri, 26 Apr 2024 14:55:20 +0200 diff --git a/debian/rules b/debian/rules index b895c336..d41696b7 100755 --- a/debian/rules +++ b/debian/rules @@ -807,6 +807,7 @@ endif -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \ -DLIBCXX_INSTALL_LIBRARY=OFF \ -DLIBCXX_INSTALL_MODULES=ON \ + -DLLVM_LIBC_GPU_BUILD=ON \ -DBOOTSTRAP_LIBCXX_INSTALL_MODULES=ON \ -DOPENMP_ENABLE_LIBOMP_PROFILING=OFF \ -DOPENMP_ENABLE_LIBOMPTARGET_PROFILING=OFF \ @@ -819,7 +820,7 @@ endif -DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ -DCLANG_ENABLE_BOOTSTRAP=ON \ -DCLANG_BOOTSTRAP_TARGETS="$(ENABLED_STAGE2_CMAKE_BUILD_TARGETS)" \ - -DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_DEFAULT_TARGET_ONLY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION;CMAKE_C_COMPILER_LAUNCHER;CMAKE_CXX_COMPILER_LAUNCHER" \ + -DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_DEFAULT_TARGET_ONLY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION;CMAKE_C_COMPILER_LAUNCHER;CMAKE_CXX_COMPILER_LAUNCHER;LLVM_LIBC_GPU_BUILD" \ -DBOOTSTRAP_CMAKE_BUILD_TYPE=RelWithDebInfo \ -DBOOTSTRAP_CMAKE_C_FLAGS_RELWITHDEBINFO="$(opt_flags)" \ -DBOOTSTRAP_CMAKE_CXX_FLAGS_RELWITHDEBINFO="$(opt_flags)" \ From 913a1b0e5e56c14d386c9e5249b281e77c972ae4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 1 May 2024 16:13:09 +0200 Subject: [PATCH 077/241] Move openmp from PROJECTS to RUNTIMES Should fix: https://github.com/llvm/llvm-project/issues/90707 --- debian/changelog | 3 +++ debian/rules | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e963eb8f..f35959c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental * after upstream 330d8983d25d08580fc1642fea48b2473f47a9da adjust the RUNTIMES build to include offload (was openmp/libomptarget) * try to build with LLVM_LIBC_GPU_BUILD + * Move openmp from PROJECTS to RUNTIMES + Should fix: + https://github.com/llvm/llvm-project/issues/90707 -- Sylvestre Ledru Fri, 26 Apr 2024 14:55:20 +0200 diff --git a/debian/rules b/debian/rules index d41696b7..35a30261 100755 --- a/debian/rules +++ b/debian/rules @@ -377,8 +377,7 @@ OPENMP_ENABLE=yes ifneq (,$(filter $(DEB_HOST_ARCH), m68k mipsel powerpc powerpcspe sparc64 s390x x32)) OPENMP_ENABLE=no else - PROJECTS += ;openmp - RUNTIMES += ;offload + RUNTIMES += ;openmp;offload STAGE_ALL_CMAKE_EXTRA += -DLIBOMP_LIBFLAGS="-lm" ifeq ($(LIBUNWIND_ENABLE),yes) STAGE_ALL_CMAKE_EXTRA += -DOPENMP_USE_LLVM_UNWINDER=ON From c8fe86e063d5907bbd1a18daed7187e9e0eb3deb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 2 May 2024 08:27:22 +0200 Subject: [PATCH 078/241] rebase of the patches --- debian/patches/bootstrap-fix-include-next.diff | 14 +++++++------- debian/patches/lldb/lldb-soname.diff | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/patches/bootstrap-fix-include-next.diff b/debian/patches/bootstrap-fix-include-next.diff index 4a638e61..8f2fd783 100644 --- a/debian/patches/bootstrap-fix-include-next.diff +++ b/debian/patches/bootstrap-fix-include-next.diff @@ -13,10 +13,10 @@ include search path, clang's header will call itself without any effect. Therefore, it will do include_next until the define from the libc is existing (ex: _INTTYPES_H) -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/inttypes.h +Index: llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/clang/lib/Headers/inttypes.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Headers/inttypes.h -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/inttypes.h +--- llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412.orig/clang/lib/Headers/inttypes.h ++++ llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/clang/lib/Headers/inttypes.h @@ -6,7 +6,7 @@ * \*===----------------------------------------------------------------------===*/ @@ -26,10 +26,10 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Header // AIX system headers need inttypes.h to be re-enterable while _STD_TYPES_T // is defined until an inclusion of it without _STD_TYPES_T occurs, in which // case the header guard macro is defined. -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/limits.h +Index: llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/clang/lib/Headers/limits.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Headers/limits.h -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/limits.h +--- llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412.orig/clang/lib/Headers/limits.h ++++ llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/clang/lib/Headers/limits.h @@ -6,7 +6,7 @@ * \*===----------------------------------------------------------------------===*/ @@ -38,4 +38,4 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Header +#if !defined(__CLANG_LIMITS_H) || !defined(_LIBC_LIMITS_H_) #define __CLANG_LIMITS_H - /* The system's limits.h may, in turn, try to #include_next GCC's limits.h. + #if defined(__MVS__) && __has_include_next() diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff index e4ac1452..dbd0db8c 100644 --- a/debian/patches/lldb/lldb-soname.diff +++ b/debian/patches/lldb/lldb-soname.diff @@ -2,13 +2,13 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/CMakeLists.txt -@@ -24,7 +24,12 @@ lldb_tablegen(../../include/lldb/API/SBL - SOURCE ${LLVM_MAIN_INCLUDE_DIR}/llvm/BinaryFormat/Dwarf.def - TARGET lldb-sbapi-dwarf-enums) +--- llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/lldb/source/API/CMakeLists.txt +@@ -34,7 +34,12 @@ add_custom_target( + WORKING_DIRECTORY ${LLVM_LIBRARY_OUTPUT_INTDIR} + ) -add_lldb_library(liblldb SHARED ${option_framework} +set(output_name lldb) @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/ SBAddress.cpp SBAttachInfo.cpp SBBlock.cpp -@@ -176,7 +181,7 @@ endif() +@@ -186,7 +191,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/ ) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) -@@ -242,12 +247,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) +@@ -252,12 +257,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() From bb9941e160c97230026f006bd501bee1eb40f554 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 2 May 2024 16:26:42 +0200 Subject: [PATCH 079/241] Ship zos_wrappers/builtins.h in libclang-common-19-dev --- debian/changelog | 1 + debian/libclang-common-X.Y-dev.install.in | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index f35959c8..520ddcb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental * Move openmp from PROJECTS to RUNTIMES Should fix: https://github.com/llvm/llvm-project/issues/90707 + * Ship zos_wrappers/builtins.h in libclang-common-19-dev -- Sylvestre Ledru Fri, 26 Apr 2024 14:55:20 +0200 diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 89cfed01..43abdb24 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -6,3 +6,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/llvm_libc_wrappers/*.h +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/zos_wrappers/ From d520125d7015fe74e8776f171a7be26579dfc08c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 3 May 2024 10:00:24 +0200 Subject: [PATCH 080/241] Also ship libc++.modules.json in libc++-19-dev-wasm32 --- debian/changelog | 10 ++++++++++ debian/libc++-X.Y-dev-wasm32.install.in | 1 + 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 520ddcb9..85d73d2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental; urgency=medium +<<<<<<< * after upstream 330d8983d25d08580fc1642fea48b2473f47a9da adjust the RUNTIMES build to include offload (was openmp/libomptarget) * try to build with LLVM_LIBC_GPU_BUILD @@ -7,6 +8,15 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental Should fix: https://github.com/llvm/llvm-project/issues/90707 * Ship zos_wrappers/builtins.h in libclang-common-19-dev +======= + * after upstream 330d8983d25d08580fc1642fea48b2473f47a9da + adjust the RUNTIMES build to include offload (was openmp/libomptarget) + * try to build with LLVM_LIBC_GPU_BUILD + * Move openmp from PROJECTS to RUNTIMES + Should fix: + https://github.com/llvm/llvm-project/issues/90707 + * Also ship libc++.modules.json in libc++-19-dev-wasm32 +>>>>>>> -- Sylvestre Ledru Fri, 26 Apr 2024 14:55:20 +0200 diff --git a/debian/libc++-X.Y-dev-wasm32.install.in b/debian/libc++-X.Y-dev-wasm32.install.in index e79cc362..7c8171f6 100644 --- a/debian/libc++-X.Y-dev-wasm32.install.in +++ b/debian/libc++-X.Y-dev-wasm32.install.in @@ -1,4 +1,5 @@ usr/lib/llvm-@LLVM_VERSION@/lib/wasm32-wasi/libc++.a usr/lib/llvm-@LLVM_VERSION@/lib/wasm32-wasi/libc++experimental.a +usr/lib/llvm-@LLVM_VERSION@/lib/wasm32-wasi/libc++.modules.json usr/lib/llvm-@LLVM_VERSION@/include/wasm32-wasi/c++/ usr/lib/llvm-@LLVM_VERSION@/include/wasm32-wasi/c++/v1/ From 7dd4eccab493dc1ca57dc579ffdd41262c850f53 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 3 May 2024 11:13:22 +0200 Subject: [PATCH 081/241] with coverity, disable sccache for real --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 35a30261..d98039da 100755 --- a/debian/rules +++ b/debian/rules @@ -570,6 +570,7 @@ ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS))) CONFIGURE_EXTRA += --enable-assertions STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON SCCACHE_ENABLE=no + SCCACHE_CMAKE= # no need to run tests in this case RUN_TEST=no endif From 0b9cca6cb78c05713ec8ec80da799a7277d423b1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 9 May 2024 08:54:46 +0200 Subject: [PATCH 082/241] rebase of the patches --- debian/patches/lldb/lldb-soname.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff index dbd0db8c..68cdc0d3 100644 --- a/debian/patches/lldb/lldb-soname.diff +++ b/debian/patches/lldb/lldb-soname.diff @@ -2,13 +2,13 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509085104+fd1bd53ba5a0/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/lldb/source/API/CMakeLists.txt -@@ -34,7 +34,12 @@ add_custom_target( - WORKING_DIRECTORY ${LLVM_LIBRARY_OUTPUT_INTDIR} - ) +--- llvm-toolchain-snapshot_19~++20240509085104+fd1bd53ba5a0.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509085104+fd1bd53ba5a0/lldb/source/API/CMakeLists.txt +@@ -36,7 +36,12 @@ add_custom_command( + add_custom_target(lldb-sbapi-dwarf-enums + DEPENDS ${sb_languages_file}) -add_lldb_library(liblldb SHARED ${option_framework} +set(output_name lldb) @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/lldb/source/API/ SBAddress.cpp SBAttachInfo.cpp SBBlock.cpp -@@ -186,7 +191,7 @@ endif() +@@ -188,7 +193,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/lldb/source/API/ ) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) -@@ -252,12 +257,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) +@@ -254,12 +259,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() From 395126a606a43e51ca7d1f4ca27382c2fe9692fa Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 9 May 2024 19:19:55 +0200 Subject: [PATCH 083/241] * Install libLibcTableGenUtil and rpc files in llvmlibc --- debian/changelog | 12 ++---------- debian/libllvmlibc-X.Y-dev.install.in | 4 ++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 85d73d2c..20907660 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,5 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental; urgency=medium -<<<<<<< - * after upstream 330d8983d25d08580fc1642fea48b2473f47a9da - adjust the RUNTIMES build to include offload (was openmp/libomptarget) - * try to build with LLVM_LIBC_GPU_BUILD - * Move openmp from PROJECTS to RUNTIMES - Should fix: - https://github.com/llvm/llvm-project/issues/90707 - * Ship zos_wrappers/builtins.h in libclang-common-19-dev -======= * after upstream 330d8983d25d08580fc1642fea48b2473f47a9da adjust the RUNTIMES build to include offload (was openmp/libomptarget) * try to build with LLVM_LIBC_GPU_BUILD @@ -16,7 +7,8 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental Should fix: https://github.com/llvm/llvm-project/issues/90707 * Also ship libc++.modules.json in libc++-19-dev-wasm32 ->>>>>>> + * Install libLibcTableGenUtil and rpc files in llvmlibc + * Ship zos_wrappers/builtins.h in libclang-common-19-dev -- Sylvestre Ledru Fri, 26 Apr 2024 14:55:20 +0200 diff --git a/debian/libllvmlibc-X.Y-dev.install.in b/debian/libllvmlibc-X.Y-dev.install.in index cd6c1add..76caad8d 100644 --- a/debian/libllvmlibc-X.Y-dev.install.in +++ b/debian/libllvmlibc-X.Y-dev.install.in @@ -1 +1,5 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libllvmlibc.a +usr/lib/llvm-@LLVM_VERSION@/include/llvmlibc_rpc_opcodes.h +usr/lib/llvm-@LLVM_VERSION@/include/llvmlibc_rpc_server.h +usr/lib/llvm-@LLVM_VERSION@/lib/libLibcTableGenUtil.a +usr/lib/llvm-@LLVM_VERSION@/lib/libllvmlibc_rpc_server.a \ No newline at end of file From 6975acd1a6e81175cd17bec7cb7cfbe2bb709fb9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 9 May 2024 21:25:10 +0200 Subject: [PATCH 084/241] rebase of the patches --- debian/patches/openmp-fix-runtimes-build.diff | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 87bcbeae..1860219c 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_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CM -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -555,7 +556,7 @@ if(runtimes) +@@ -557,7 +558,7 @@ if(runtimes) # build directory cannot find the C++ headers in certain configurations. # I need to build a mechanism for runtime projects to provide CMake code # that executes at LLVM configuration time to handle this case. @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/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_19~++20240430112652+10aab63c9cb4/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/CMakeLists.txt -@@ -129,6 +129,28 @@ else() +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/CMakeLists.txt +@@ -119,6 +119,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,23 +56,20 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/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_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/cuda/CMakeLists.txt -@@ -52,6 +52,8 @@ else() +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/cuda/CMakeLists.txt +@@ -51,3 +51,5 @@ else() + libomptarget_say("Not generating NVIDIA tests, no supported devices detected." " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() - -+add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) + - # Install plugin under the lib destination folder. - install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}") - set_target_properties(omptarget.rtl.cuda PROPERTIES -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMakeLists.txt ++add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/src/CMakeLists.txt @@ -50,7 +50,10 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY @@ -85,10 +82,10 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMak ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR} ) -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/CMakeLists.txt @@ -323,6 +323,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -100,10 +97,10 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/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_19~++20240430112652+10aab63c9cb4/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/src/CMakeLists.txt @@ -152,6 +152,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -121,10 +118,10 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/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_19~++20240430112652+10aab63c9cb4/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/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) @@ -135,16 +132,16 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/host/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/host/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/plugins-nextgen/host/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/host/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/host/CMakeLists.txt @@ -31,6 +31,8 @@ else() target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) endif() -+add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") +++add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") + - # Install plugin under the lib destination folder. - install(TARGETS omptarget.rtl.host - LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}") + target_include_directories(omptarget.rtl.host PRIVATE + ${LIBOMPTARGET_INCLUDE_DIR}) + From d29fc2a10b6c5dcf4428d1a10b32e988a279c16f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 10 May 2024 21:14:12 +0200 Subject: [PATCH 085/241] fix patch --- debian/patches/openmp-fix-runtimes-build.diff | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 1860219c..3fa6fe9d 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -1,7 +1,6 @@ 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_19~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt =================================================================== --- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/llvm/runtimes/CMakeLists.txt @@ -140,7 +139,7 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins- target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) endif() -++add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") ++add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") + target_include_directories(omptarget.rtl.host PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) From 07b5e8fc12a037693aa08bc8caacf876314359f9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 11 May 2024 08:05:58 +0200 Subject: [PATCH 086/241] offload: disable a static assert https://github.com/llvm/llvm-project/issues/91819 --- .../offload-disable-static-assert.diff | 19 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 20 insertions(+) create mode 100644 debian/patches/offload-disable-static-assert.diff diff --git a/debian/patches/offload-disable-static-assert.diff b/debian/patches/offload-disable-static-assert.diff new file mode 100644 index 00000000..df760b54 --- /dev/null +++ b/debian/patches/offload-disable-static-assert.diff @@ -0,0 +1,19 @@ +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/include/Shared/APITypes.h +=================================================================== +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/include/Shared/APITypes.h ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/include/Shared/APITypes.h +@@ -108,10 +108,10 @@ struct KernelArgsTy { + }; + static_assert(sizeof(KernelArgsTy().Flags) == sizeof(uint64_t), + "Invalid struct size"); +-static_assert(sizeof(KernelArgsTy) == +- (8 * sizeof(int32_t) + 3 * sizeof(int64_t) + +- 4 * sizeof(void **) + 2 * sizeof(int64_t *)), +- "Invalid struct size"); ++// static_assert(sizeof(KernelArgsTy) == ++// (8 * sizeof(int32_t) + 3 * sizeof(int64_t) + ++// 4 * sizeof(void **) + 2 * sizeof(int64_t *)), ++// "Invalid struct size"); + } + + #endif // OMPTARGET_SHARED_API_TYPES_H diff --git a/debian/patches/series b/debian/patches/series index 04c9e844..7750a277 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -150,3 +150,4 @@ arm32-defaults.diff mips/D154390-pre-R6.diff disable-openmp-per-target.diff libsanitizer-timebits.diff +offload-disable-static-assert.diff From 2baa906bfb1ad9f42b34ee84f21a88de32e93aa3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 May 2024 13:53:18 +0200 Subject: [PATCH 087/241] Disable openmp on i386 - wasn't officially supported --- debian/changelog | 1 + debian/control | 4 ++-- debian/control.in | 4 ++-- debian/rules | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 20907660..617116fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental * Also ship libc++.modules.json in libc++-19-dev-wasm32 * Install libLibcTableGenUtil and rpc files in llvmlibc * Ship zos_wrappers/builtins.h in libclang-common-19-dev + * Disable openmp on i386 - wasn't officially supported -- Sylvestre Ledru Fri, 26 Apr 2024 14:55:20 +0200 diff --git a/debian/control b/debian/control index c6cfb2ea..ecfab2c0 100644 --- a/debian/control +++ b/debian/control @@ -622,7 +622,7 @@ Description: Next generation, high-performance debugger, header files Package: libomp-19-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf loong64 mips64el ppc64el ppc64 riscv64 Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-19-doc Breaks: libiomp-dev (<< 3.7-1) @@ -636,7 +636,7 @@ Description: LLVM OpenMP runtime - dev package Package: libomp5-19 Multi-Arch: same -Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf loong64 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y diff --git a/debian/control.in b/debian/control.in index ab11703a..b22222a3 100644 --- a/debian/control.in +++ b/debian/control.in @@ -622,7 +622,7 @@ Description: Next generation, high-performance debugger, header files Package: libomp-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf loong64 mips64el ppc64el ppc64 riscv64 Depends: libomp5-@LLVM_VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-@LLVM_VERSION@-doc Breaks: libiomp-dev (<< 3.7-1) @@ -636,7 +636,7 @@ Description: LLVM OpenMP runtime - dev package Package: libomp5-@LLVM_VERSION@ Multi-Arch: same -Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf loong64 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y diff --git a/debian/rules b/debian/rules index d98039da..92ce8927 100755 --- a/debian/rules +++ b/debian/rules @@ -374,7 +374,7 @@ endif # Enable openmp (or not) OPENMP_ENABLE=yes -ifneq (,$(filter $(DEB_HOST_ARCH), m68k mipsel powerpc powerpcspe sparc64 s390x x32)) +ifneq (,$(filter $(DEB_HOST_ARCH), i386 m68k mipsel powerpc powerpcspe sparc64 s390x x32)) OPENMP_ENABLE=no else RUNTIMES += ;openmp;offload From 845ba9de6159c3dbe5f1ba52533cf6b121a2fa31 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 17 May 2024 09:06:47 +0200 Subject: [PATCH 088/241] Disable the cmake check for LibcTableGenUtil. Closes: #92359 --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 617116fb..9c5b759c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental * Install libLibcTableGenUtil and rpc files in llvmlibc * Ship zos_wrappers/builtins.h in libclang-common-19-dev * Disable openmp on i386 - wasn't officially supported + * Disable the cmake check for LibcTableGenUtil. Closes: #92359 -- Sylvestre Ledru Fri, 26 Apr 2024 14:55:20 +0200 diff --git a/debian/rules b/debian/rules index 92ce8927..4b63642c 100755 --- a/debian/rules +++ b/debian/rules @@ -1291,7 +1291,7 @@ endif sed -i '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i '/_IMPORT_CHECK_FILES_FOR_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|Polly\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake - sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake + sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|omptarget\|LibcTableGenUtil\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake # Disable CMake's package validation checks for binaries that may not be installed sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake From 199de01f808b1fae7a5ad1b40684b07002d7ea60 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 17 May 2024 09:12:26 +0200 Subject: [PATCH 089/241] rebase of the patches --- .../23-strlcpy_strlcat_warning_removed.diff | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 8f53b894..6e9c9a59 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,11 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/AST/Decl.cpp -@@ -4391,13 +4391,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/AST/Decl.cpp +@@ -4426,13 +4426,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/Sema/SemaChecking.cpp +--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/SemaChecking.cpp @@ -1320,8 +1320,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: @@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -8126,10 +8126,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -8179,10 +8179,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -59,27 +59,26 @@ Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules - - {{CDM::CLibraryMaybeHardened, {BI.getName(Builtin::BIstrncat)}}, +--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -741,9 +741,9 @@ void GenericTaintChecker::initTaintRules TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, -- {{CDM::CLibraryMaybeHardened, {BI.getName(Builtin::BIstrlcpy)}}, -+/* {{CDM::CLibraryMaybeHardened, {BI.getName(Builtin::BIstrlcpy)}}, - TR::Prop({{1, 2}}, {{0}})}, - {{CDM::CLibraryMaybeHardened, {BI.getName(Builtin::BIstrlcat)}}, -- TR::Prop({{1, 2}}, {{0}})}, -+ TR::Prop({{1, 2}}, {{0}})},*/ - {{CDM::CLibraryMaybeHardened, {{"snprintf"}}}, - TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, - {{CDM::CLibraryMaybeHardened, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/builtins.c + {{CDM::CLibraryMaybeHardened, {"strncat"}}, + TR::Prop({{0, 1, 2}}, {{0, ReturnValueIndex}})}, +- {{CDM::CLibraryMaybeHardened, {"strlcpy"}}, TR::Prop({{1, 2}}, {{0}})}, ++/* {{CDM::CLibraryMaybeHardened, {"strlcpy"}}, TR::Prop({{1, 2}}, {{0}})}, + {{CDM::CLibraryMaybeHardened, {"strlcat"}}, TR::Prop({{0, 1, 2}}, {{0}})}, +- ++*/ + // Usually the matching mode `CDM::CLibraryMaybeHardened` is sufficient + // for unified handling of a function `FOO()` and its hardened variant + // `__FOO_chk()`, but in the "sprintf" family the extra parameters of the +Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -111,10 +110,10 @@ Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -171,11 +170,11 @@ Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} -Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/include/clang/Basic/Builtins.td +Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/include/clang/Basic/Builtins.td =================================================================== ---- llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e.orig/clang/include/clang/Basic/Builtins.td -+++ llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/include/clang/Basic/Builtins.td -@@ -3262,7 +3262,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h +--- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/include/clang/Basic/Builtins.td +@@ -3274,7 +3274,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h // non-standard but very common @@ -185,7 +184,7 @@ Index: llvm-toolchain-snapshot_19~++20240405104807+0aa982fb326e/clang/include/cl let Spellings = ["strlcpy"]; let Prototype = "size_t(char*, char const*, size_t)"; } -@@ -3271,6 +3272,7 @@ def StrlCat : GNULibBuiltin<"string.h"> +@@ -3283,6 +3284,7 @@ def StrlCat : GNULibBuiltin<"string.h"> let Spellings = ["strlcat"]; let Prototype = "size_t(char*, char const*, size_t)"; } From c2c13bf486aa40bc65697a41e9a83e1c8f446401 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 17 May 2024 14:43:28 +0200 Subject: [PATCH 090/241] move the cmake LibcTableGenUtil declaration at the right place --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 4b63642c..24be589b 100755 --- a/debian/rules +++ b/debian/rules @@ -1290,8 +1290,8 @@ endif sed -i '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i '/_IMPORT_CHECK_FILES_FOR_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake - sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|Polly\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake - sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|omptarget\|LibcTableGenUtil\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake + sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|Polly\|MLIR\|LibcTableGenUtil\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake + sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake # Disable CMake's package validation checks for binaries that may not be installed sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake From b76df158febc5b420a2cd8925b79832b40662891 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 17 May 2024 09:21:26 +0200 Subject: [PATCH 091/241] prepare upload --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9c5b759c..2a342912 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental; urgency=medium +llvm-toolchain-snapshot (1:19~++20240517091955+e0a293d12f3f-1~exp1) experimental; urgency=medium + * experimental New snapshot release * after upstream 330d8983d25d08580fc1642fea48b2473f47a9da adjust the RUNTIMES build to include offload (was openmp/libomptarget) * try to build with LLVM_LIBC_GPU_BUILD @@ -10,9 +11,9 @@ llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp2) experimental * Install libLibcTableGenUtil and rpc files in llvmlibc * Ship zos_wrappers/builtins.h in libclang-common-19-dev * Disable openmp on i386 - wasn't officially supported - * Disable the cmake check for LibcTableGenUtil. Closes: #92359 + * Disable the cmake check for LibcTableGenUtil. Closes upstream issue #92359 - -- Sylvestre Ledru Fri, 26 Apr 2024 14:55:20 +0200 + -- Sylvestre Ledru Fri, 17 May 2024 09:21:04 +0200 llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp1) experimental; urgency=medium From 7a215a5e4b7a211bbf8ee1fca3faa2e6966fff21 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 May 2024 08:02:22 +0200 Subject: [PATCH 092/241] rebase of the patches --- debian/patches/openmp-fix-runtimes-build.diff | 64 +++++++++---------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 3fa6fe9d..3fdba7fd 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -1,10 +1,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 -Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/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_19~++20240509091947+dcf92a249233/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/CMakeLists.txt @@ -119,6 +119,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -55,37 +55,35 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/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_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/cuda/CMakeLists.txt -@@ -51,3 +51,5 @@ else() - libomptarget_say("Not generating NVIDIA tests, no supported devices detected." +--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/cuda/CMakeLists.txt +@@ -33,3 +33,5 @@ else() + message(STATUS "Not generating NVIDIA tests, no supported devices detected." " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() + +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) -Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/src/CMakeLists.txt -@@ -50,7 +50,10 @@ add_llvm_library(omptarget +--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMakeLists.txt +@@ -38,6 +38,9 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY ) --target_include_directories(omptarget PRIVATE + +add_runtimes_build_depends_if_needed(omptarget) + -+target_include_directories(omptarget PRIVATE + target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR} ) - -Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/CMakeLists.txt -@@ -323,6 +323,10 @@ if(LIBOMP_STATS) +--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/CMakeLists.txt +@@ -326,6 +326,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -96,11 +94,11 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/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_19~++20240509091947+dcf92a249233/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/src/CMakeLists.txt -@@ -152,6 +152,7 @@ set_source_files_properties(${LIBOMP_ASM +--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/src/CMakeLists.txt +@@ -151,6 +151,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) @@ -108,7 +106,7 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/s else() set(LIBOMP_LINKER_LANGUAGE CXX) endif() -@@ -217,6 +218,8 @@ else() +@@ -216,6 +217,8 @@ else() ) endif() @@ -117,10 +115,10 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/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_19~++20240509091947+dcf92a249233/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/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) @@ -131,10 +129,10 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) -Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/host/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/host/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/plugins-nextgen/host/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/host/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/host/CMakeLists.txt @@ -31,6 +31,8 @@ else() target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) endif() From b7afc087769e2d2852e85b0e7d60199bfb4dd242 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 May 2024 14:13:16 +0200 Subject: [PATCH 093/241] Ship usr/lib/llvm-@LLVM_VERSION@/lib/libCUF*.a in libflang --- debian/changelog | 1 + debian/libflang-X.Y-dev.install.in | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2a342912..e94844ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ llvm-toolchain-snapshot (1:19~++20240517091955+e0a293d12f3f-1~exp1) experimental * Ship zos_wrappers/builtins.h in libclang-common-19-dev * Disable openmp on i386 - wasn't officially supported * Disable the cmake check for LibcTableGenUtil. Closes upstream issue #92359 + * Ship usr/lib/llvm-@LLVM_VERSION@/lib/libCUF*.a in libflang -- Sylvestre Ledru Fri, 17 May 2024 09:21:04 +0200 diff --git a/debian/libflang-X.Y-dev.install.in b/debian/libflang-X.Y-dev.install.in index 043f86ab..69954cf6 100644 --- a/debian/libflang-X.Y-dev.install.in +++ b/debian/libflang-X.Y-dev.install.in @@ -5,3 +5,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libflangFrontendTool.a usr/lib/llvm-@LLVM_VERSION@/lib/libFIR*.a usr/lib/llvm-@LLVM_VERSION@/lib/libHLFIR*.a usr/lib/llvm-@LLVM_VERSION@/lib/libFortran*.a +usr/lib/llvm-@LLVM_VERSION@/lib/libCUF*.a From 3e0fccb74bad99c60ac9377d51fcb424fdbaacb3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 21 May 2024 18:35:43 +0200 Subject: [PATCH 094/241] rebase of the patches --- debian/patches/mips/mips-force-nomadd4.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/patches/mips/mips-force-nomadd4.patch b/debian/patches/mips/mips-force-nomadd4.patch index b91ca1d5..6ff12dee 100644 --- a/debian/patches/mips/mips-force-nomadd4.patch +++ b/debian/patches/mips/mips-force-nomadd4.patch @@ -6,16 +6,18 @@ support both, we have to disabled those instructions. For that, the patch below basically corresponds to the --with-madd4=no used on the GCC side. -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/Targets/Mips.h +Index: llvm-toolchain-snapshot_19~++20240521052636+4ae896fe979b/clang/lib/Basic/Targets/Mips.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Basic/Targets/Mips.h -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/Targets/Mips.h -@@ -334,6 +334,8 @@ public: +--- llvm-toolchain-snapshot_19~++20240521052636+4ae896fe979b.orig/clang/lib/Basic/Targets/Mips.h ++++ llvm-toolchain-snapshot_19~++20240521052636+4ae896fe979b/clang/lib/Basic/Targets/Mips.h +@@ -349,7 +349,9 @@ public: HasMSA = true; else if (Feature == "+nomadd4") DisableMadd4 = true; +- else if (Feature == "+fp64") { + else if (Feature == "-nomadd4") + DisableMadd4 = false; - else if (Feature == "+fp64") ++ else if (Feature == "+fp64") { FPMode = FP64; - else if (Feature == "-fp64") + FpGiven = true; + } else if (Feature == "-fp64") { From c023d81235fa731f09b480d471ff2b8919e64caf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 May 2024 14:50:52 +0200 Subject: [PATCH 095/241] rebase of the patches --- .../libcxx/libcxx-silent-failure-arm64.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff index 8095c353..700be983 100644 --- a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff +++ b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_18~++20231102103655+18839aec4ed1/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +Index: llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20231102103655+18839aec4ed1.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp -+++ llvm-toolchain-snapshot_18~++20231102103655+18839aec4ed1/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +--- llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp ++++ llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp @@ -8,6 +8,7 @@ // // UNSUPPORTED: no-threads @@ -10,13 +10,13 @@ Index: llvm-toolchain-snapshot_18~++20231102103655+18839aec4ed1/libcxx/test/std/ // -Index: llvm-toolchain-snapshot_18~++20231102103655+18839aec4ed1/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +Index: llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20231102103655+18839aec4ed1.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -+++ llvm-toolchain-snapshot_18~++20231102103655+18839aec4ed1/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -@@ -10,6 +10,8 @@ +--- llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp ++++ llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +@@ -9,6 +9,8 @@ + // UNSUPPORTED: no-threads // UNSUPPORTED: c++03, c++11 - // ALLOW_RETRIES: 2 +// XFAIL: * + From 462ed0ff1fda1419dc6f593acbe4dc2ed5f1d5bd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 23 May 2024 22:33:38 +0200 Subject: [PATCH 096/241] rebase of the patches --- .../libcxx/libcxx-silent-failure-arm64.diff | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff index 700be983..a6fdf347 100644 --- a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff +++ b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff @@ -1,19 +1,19 @@ -Index: llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +Index: llvm-toolchain-snapshot_19~++20240523103209+70d1844abebb/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp -+++ llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp -@@ -8,6 +8,7 @@ - // - // UNSUPPORTED: no-threads - // ALLOW_RETRIES: 2 +--- llvm-toolchain-snapshot_19~++20240523103209+70d1844abebb.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp ++++ llvm-toolchain-snapshot_19~++20240523103209+70d1844abebb/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +@@ -7,6 +7,7 @@ + //===----------------------------------------------------------------------===// + + // UNSUPPORTED: no-threads, c++03 +// XFAIL: * // -Index: llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +Index: llvm-toolchain-snapshot_19~++20240523103209+70d1844abebb/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -+++ llvm-toolchain-snapshot_19~++20240522023027+71b1fbdff6cf/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +--- llvm-toolchain-snapshot_19~++20240523103209+70d1844abebb.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp ++++ llvm-toolchain-snapshot_19~++20240523103209+70d1844abebb/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp @@ -9,6 +9,8 @@ // UNSUPPORTED: no-threads // UNSUPPORTED: c++03, c++11 From ee41a9a7325ae4cf2598dd7efc25108c68323384 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 25 May 2024 22:53:38 +0200 Subject: [PATCH 097/241] rebase of the patch --- debian/patches/lldb/lldb-soname.diff | 16 ++++++++-------- debian/patches/llvm-fix-lld-linker-check.diff | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff index 68cdc0d3..90885702 100644 --- a/debian/patches/lldb/lldb-soname.diff +++ b/debian/patches/lldb/lldb-soname.diff @@ -2,13 +2,13 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240509085104+fd1bd53ba5a0/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240525104623+faef8b4aa245/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240509085104+fd1bd53ba5a0.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240509085104+fd1bd53ba5a0/lldb/source/API/CMakeLists.txt -@@ -36,7 +36,12 @@ add_custom_command( - add_custom_target(lldb-sbapi-dwarf-enums +--- llvm-toolchain-snapshot_19~++20240525104623+faef8b4aa245.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240525104623+faef8b4aa245/lldb/source/API/CMakeLists.txt +@@ -40,7 +40,12 @@ add_custom_target(lldb-sbapi-dwarf-enums DEPENDS ${sb_languages_file}) + set_target_properties(lldb-sbapi-dwarf-enums PROPERTIES FOLDER "LLDB/Tablegenning") -add_lldb_library(liblldb SHARED ${option_framework} +set(output_name lldb) @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_19~++20240509085104+fd1bd53ba5a0/lldb/source/API/ SBAddress.cpp SBAttachInfo.cpp SBBlock.cpp -@@ -188,7 +193,7 @@ endif() +@@ -192,7 +197,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,8 +29,8 @@ Index: llvm-toolchain-snapshot_19~++20240509085104+fd1bd53ba5a0/lldb/source/API/ ) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) -@@ -254,12 +259,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) - set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") +@@ -256,12 +261,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) + add_llvm_symbol_exports(liblldb ${exported_symbol_file}) endif() -if (NOT MSVC) diff --git a/debian/patches/llvm-fix-lld-linker-check.diff b/debian/patches/llvm-fix-lld-linker-check.diff index c96e02a6..32779593 100644 --- a/debian/patches/llvm-fix-lld-linker-check.diff +++ b/debian/patches/llvm-fix-lld-linker-check.diff @@ -1,9 +1,9 @@ remove regex anchor in lld linker detection to account for vendor, if specified, being prepended to lld version string -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddLLVM.cmake +Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/cmake/modules/AddLLVM.cmake =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/cmake/modules/AddLLVM.cmake -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddLLVM.cmake +--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/llvm/cmake/modules/AddLLVM.cmake ++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/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 "") From 33baf6bcb0306fea8b47c11abd7f9caedb92c6ae Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 28 May 2024 23:19:08 +0200 Subject: [PATCH 098/241] rebase of the patch --- debian/patches/lldb/lldb-soname.diff | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff index 90885702..a5f73586 100644 --- a/debian/patches/lldb/lldb-soname.diff +++ b/debian/patches/lldb/lldb-soname.diff @@ -2,10 +2,10 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240525104623+faef8b4aa245/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240525104623+faef8b4aa245.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240525104623+faef8b4aa245/lldb/source/API/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/CMakeLists.txt @@ -40,7 +40,12 @@ add_custom_target(lldb-sbapi-dwarf-enums DEPENDS ${sb_languages_file}) set_target_properties(lldb-sbapi-dwarf-enums PROPERTIES FOLDER "LLDB/Tablegenning") @@ -18,9 +18,9 @@ Index: llvm-toolchain-snapshot_19~++20240525104623+faef8b4aa245/lldb/source/API/ + +add_lldb_library(liblldb SHARED OUTPUT_NAME ${output_name} SONAME SBAddress.cpp - SBAttachInfo.cpp - SBBlock.cpp -@@ -192,7 +197,7 @@ endif() + SBAddressRange.cpp + SBAddressRangeList.cpp +@@ -194,7 +199,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240525104623+faef8b4aa245/lldb/source/API/ ) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) -@@ -256,12 +261,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) +@@ -258,12 +263,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) add_llvm_symbol_exports(liblldb ${exported_symbol_file}) endif() From 0bb8ab14770072e9aaad3f30cf70b285f6519912 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 29 May 2024 09:34:34 +0200 Subject: [PATCH 099/241] Ship reduce-chunk-list in llvm --- debian/changelog | 1 + debian/llvm-X.Y.install.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index e94844ab..88860894 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ llvm-toolchain-snapshot (1:19~++20240517091955+e0a293d12f3f-1~exp1) experimental * Disable openmp on i386 - wasn't officially supported * Disable the cmake check for LibcTableGenUtil. Closes upstream issue #92359 * Ship usr/lib/llvm-@LLVM_VERSION@/lib/libCUF*.a in libflang + * Ship reduce-chunk-list in llvm -- Sylvestre Ledru Fri, 17 May 2024 09:21:04 +0200 diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index bf15d2e1..81ff8ad7 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -81,6 +81,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remarkutil usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfo-analyzer usr/lib/llvm-@LLVM_VERSION@/bin/llvm-readtapi +usr/lib/llvm-@LLVM_VERSION@/bin/reduce-chunk-list usr/bin/llvm-PerfectShuffle-@LLVM_VERSION@ usr/bin/llvm-addr2line-@LLVM_VERSION@ @@ -160,3 +161,4 @@ usr/bin/dsymutil-* usr/bin/llvm-debuginfod-find-* usr/bin/llvm-debuginfod-@LLVM_VERSION@ usr/bin/llvm-debuginfo-analyzer-@LLVM_VERSION@ +usr/bin/reduce-chunk-list-@LLVM_VERSION@ From 99f5b32d63b40c75bce6e37712c9f865a9641771 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 29 May 2024 09:36:41 +0200 Subject: [PATCH 100/241] prepare upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88860894..fcda86ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:19~++20240517091955+e0a293d12f3f-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp1) experimental; urgency=medium * experimental New snapshot release * after upstream 330d8983d25d08580fc1642fea48b2473f47a9da @@ -15,7 +15,7 @@ llvm-toolchain-snapshot (1:19~++20240517091955+e0a293d12f3f-1~exp1) experimental * Ship usr/lib/llvm-@LLVM_VERSION@/lib/libCUF*.a in libflang * Ship reduce-chunk-list in llvm - -- Sylvestre Ledru Fri, 17 May 2024 09:21:04 +0200 + -- Sylvestre Ledru Wed, 29 May 2024 09:36:25 +0200 llvm-toolchain-snapshot (1:19~++20240421021844+e095d978ba47-1~exp1) experimental; urgency=medium From 5fdf2c507527e86d5510d02efe8c3473f3745839 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 1 Jun 2024 23:16:36 +0200 Subject: [PATCH 101/241] Disable LLVM testsuite on x32 --- debian/changelog | 7 +++++++ debian/rules | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fcda86ba..3b4bf1c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Disable LLVM testsuite on x32 + + -- John Paul Adrian Glaubitz Sat, 01 Jun 2024 23:16:14 +0200 + llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp1) experimental; urgency=medium * experimental New snapshot release diff --git a/debian/rules b/debian/rules index 24be589b..5745a316 100755 --- a/debian/rules +++ b/debian/rules @@ -398,8 +398,8 @@ ifeq (riscv64,$(DEB_HOST_ARCH)) endif endif -# llvm tests timeout, disable it on mipsel -ifeq (mipsel,$(DEB_HOST_ARCH)) +# llvm tests timeout, disable it on mipsel and x32 +ifneq (,$(filter $(DEB_HOST_ARCH), mipsel x32)) RUN_TEST=no endif From edc88b5a8c233811d24504e44cdf0861b7755937 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 1 Jun 2024 23:17:04 +0200 Subject: [PATCH 102/241] Install liborc_rt-x86_64.a on x32 --- debian/changelog | 1 + debian/libclang-rt-X.Y-dev.install.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3b4bf1c7..13d19b71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; [ John Paul Adrian Glaubitz ] * Disable LLVM testsuite on x32 + * Install liborc_rt-x86_64.a on x32 -- John Paul Adrian Glaubitz Sat, 01 Jun 2024 23:16:14 +0200 diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index cd2a8425..b8248b56 100644 --- a/debian/libclang-rt-X.Y-dev.install.in +++ b/debian/libclang-rt-X.Y-dev.install.in @@ -7,4 +7,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH -[amd64 arm64 armhf armel i386 ppc64 ppc64el] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* +[amd64 arm64 armhf armel i386 ppc64 ppc64el x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* From 1594fd8aba8949978489c5822bcd52a7a5508ddf Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 1 Jun 2024 23:22:50 +0200 Subject: [PATCH 103/241] Install hwasan_symbolize on x32 --- debian/changelog | 1 + debian/clang-tools-X.Y.install.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 13d19b71..d1f495f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; [ John Paul Adrian Glaubitz ] * Disable LLVM testsuite on x32 * Install liborc_rt-x86_64.a on x32 + * Install hwasan_symbolize on x32 -- John Paul Adrian Glaubitz Sat, 01 Jun 2024 23:16:14 +0200 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 667657b6..21a19810 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -63,7 +63,7 @@ usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++ usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / HWASAN_SUPPORTED_ARCH -[amd64 arm64 riscv64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize +[amd64 arm64 riscv64 i386 x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ From 92286344f8693846ac2142a45d0c1ed9e6f5b3fd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 8 Jun 2024 15:55:19 +0200 Subject: [PATCH 104/241] rebase of the patch --- debian/patches/lower-python-dep.diff | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index c9508ff9..74897676 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,14 +1,12 @@ -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240608033056+d4eed43badfc/llvm/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/CMakeLists.txt -@@ -903,8 +903,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH - "Profiling data file to use when compiling in order to improve runtime performance.") +--- llvm-toolchain-snapshot_19~++20240608033056+d4eed43badfc.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240608033056+d4eed43badfc/llvm/CMakeLists.txt +@@ -904,7 +904,7 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH if(LLVM_INCLUDE_TESTS) -- # Lit test suite requires at least python 3.6 -- set(LLVM_MINIMUM_PYTHON_VERSION 3.6) -+ # Lit test suite requires at least python 3.5 + # All LLVM Python files should be compatible down to this minimum version. +- set(LLVM_MINIMUM_PYTHON_VERSION 3.8) + set(LLVM_MINIMUM_PYTHON_VERSION 3.5) else() # FIXME: it is unknown if this is the actual minimum bound From cfb3370f363f8293508ab002426987ee6482abc0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 14 Jun 2024 16:38:00 +0200 Subject: [PATCH 105/241] rebase of the patch --- .../offload-disable-static-assert.diff | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/debian/patches/offload-disable-static-assert.diff b/debian/patches/offload-disable-static-assert.diff index df760b54..22c2f958 100644 --- a/debian/patches/offload-disable-static-assert.diff +++ b/debian/patches/offload-disable-static-assert.diff @@ -1,19 +1,17 @@ -Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/include/Shared/APITypes.h +Index: llvm-toolchain-snapshot_19~++20240614043023+43e6f46936e1/offload/include/Shared/APITypes.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/include/Shared/APITypes.h -+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/include/Shared/APITypes.h -@@ -108,10 +108,10 @@ struct KernelArgsTy { +--- llvm-toolchain-snapshot_19~++20240614043023+43e6f46936e1.orig/offload/include/Shared/APITypes.h ++++ llvm-toolchain-snapshot_19~++20240614043023+43e6f46936e1/offload/include/Shared/APITypes.h +@@ -112,10 +112,10 @@ struct KernelArgsTy { }; static_assert(sizeof(KernelArgsTy().Flags) == sizeof(uint64_t), "Invalid struct size"); -static_assert(sizeof(KernelArgsTy) == -- (8 * sizeof(int32_t) + 3 * sizeof(int64_t) + -- 4 * sizeof(void **) + 2 * sizeof(int64_t *)), ++/*static_assert(sizeof(KernelArgsTy) == + (8 * sizeof(int32_t) + 3 * sizeof(int64_t) + + 4 * sizeof(void **) + 2 * sizeof(int64_t *)), - "Invalid struct size"); -+// static_assert(sizeof(KernelArgsTy) == -+// (8 * sizeof(int32_t) + 3 * sizeof(int64_t) + -+// 4 * sizeof(void **) + 2 * sizeof(int64_t *)), -+// "Invalid struct size"); - } ++ "Invalid struct size");*/ - #endif // OMPTARGET_SHARED_API_TYPES_H + /// Flat array of kernel launch parameters and their total size. + struct KernelLaunchParamsTy { From b22e6ab21d2d354cfa9beba393f1ee7b12853556 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 16 Jun 2024 13:28:32 +0200 Subject: [PATCH 106/241] rebase of the patch --- debian/patches/remove-apple-clang-manpage.diff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff index 982fa7cf..bddc1987 100644 --- a/debian/patches/remove-apple-clang-manpage.diff +++ b/debian/patches/remove-apple-clang-manpage.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/CommandGuide/clang.rst +Index: llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9/clang/docs/CommandGuide/clang.rst =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/CommandGuide/clang.rst -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/CommandGuide/clang.rst +--- llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9.orig/clang/docs/CommandGuide/clang.rst ++++ llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9/clang/docs/CommandGuide/clang.rst @@ -354,24 +354,10 @@ Clang fully supports cross compilation a Depending on how your version of Clang is configured, it may have support for a number of cross compilers, or may only support a native target. @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/Comma Specify the architecture to build for (all platforms). --.. option:: -mmacosx-version-min= +-.. option:: -mmacos-version-min= - - When building for macOS, specify the minimum version supported by your - application. @@ -33,7 +33,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/Comma -.. envvar:: MACOSX_DEPLOYMENT_TARGET - -- If :option:`-mmacosx-version-min` is unspecified, the default deployment +- If :option:`-mmacos-version-min` is unspecified, the default deployment - target is read from this environment variable. This option only affects - Darwin targets. From bfae9787996afccee0463a03e9a7e46c7a339e5a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 18 Jun 2024 12:00:09 +0200 Subject: [PATCH 107/241] llvmlibc: try to workaround the bionic issue --- debian/rules | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 5745a316..eb06a119 100755 --- a/debian/rules +++ b/debian/rules @@ -330,7 +330,13 @@ ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) endif ifneq (,$(filter libllvmlibc-$(LLVM_VERSION)-dev, $(packages))) - RUNTIMES += ;libc + RUNTIMES += ;libc + LLVM_LIBC_FULL_DISTRO := bionic +# Workaround on bionic +# See https://github.com/llvm/llvm-project/issues/82467#issuecomment-2033193448 + ifeq (,$(filter-out $(LLVM_LIBC_FULL_DISTRO), $(DISTRO))) + STAGE_ALL_CMAKE_EXTRA += -DLLVM_LIBC_FULL_BUILD=ON + endif endif # flang is only for 64bits From 0e0c765d7fefd75a157b9de19700bc9d761409ad Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Sat, 22 Jun 2024 00:04:46 +0200 Subject: [PATCH 108/241] lldb: Enable Intel Processor Trace The necessary library is available in debian, obviously limited to the x86 architecture. Build lldb to support this functionality [1]. [1] - https://lldb.llvm.org/use/intel_pt.html --- debian/control | 1 + debian/control.in | 1 + debian/rules | 3 +++ 3 files changed, 5 insertions(+) diff --git a/debian/control b/debian/control index ecfab2c0..953d8b3a 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, binutils-dev, libxml2-dev, libjsoncpp-dev, pkg-config, + libipt-dev [amd64 i386], lcov, procps, help2man, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], diff --git a/debian/control.in b/debian/control.in index b22222a3..edfb213f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, binutils-dev, libxml2-dev, libjsoncpp-dev, pkg-config, + libipt-dev [amd64 i386], lcov, procps, help2man, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], diff --git a/debian/rules b/debian/rules index eb06a119..fd19a3c6 100755 --- a/debian/rules +++ b/debian/rules @@ -452,6 +452,9 @@ else STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_LUA=OFF PROJECTS+=;lldb endif +ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) + STAGE_ALL_CMAKE_EXTRA += -DLLDB_BUILD_INTEL_PT=ON -DLIBIPT_INCLUDE_PATH=/usr/include -DLIBIPT_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH) +endif LLDB_PYTHON_DISABLE_DISTRO := bionic buster LLDB_PYTHON_ENABLE=yes From f34ad196a31194c93ee380a546ce5e9e71253de2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 22 Jun 2024 23:04:59 +0200 Subject: [PATCH 109/241] rebase of the patch --- .../openmp/openmp-check-execstack.diff | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/debian/patches/openmp/openmp-check-execstack.diff b/debian/patches/openmp/openmp-check-execstack.diff index b903ac4e..9affad35 100644 --- a/debian/patches/openmp/openmp-check-execstack.diff +++ b/debian/patches/openmp/openmp-check-execstack.diff @@ -1,14 +1,13 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/openmp/runtime/tools/check-execstack.pl +Index: llvm-toolchain-snapshot_19~++20240622104700+f5b93ae5884d/openmp/runtime/tools/check-execstack.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/openmp/runtime/tools/check-execstack.pl -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/openmp/runtime/tools/check-execstack.pl -@@ -45,7 +45,8 @@ sub execstack($) { - # GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4 - # Linux* OS Intel(R) 64: - # GNU_STACK 0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RWE 0x8 -- if ( $stack[ 0 ] !~ m{\A\s*(?:GNU_)?STACK(?:\s+0x[0-9a-f]+){5}\s+([R ][W ][E ])\s+0x[0-9a-f]+\s*\z} ) { -+# if ( $stack[ 0 ] !~ m{\A\s*(?:GNU_)?STACK(?:\s+0x[0-9a-f]+){5}\s+([R ][W ][E ])\s+0x[0-9a-f]+\s*\z} ) { -+ if ( $stack[ 0 ] !~ m{\A\s*(?:GNU_)?STACK(?:\s+0x[0-9a-f]+){5}\s+([R ][W ][E ])\s+0(?:x[0-9a-f]+)*\s*\z} ) { - runtime_error( "$file: Cannot parse stack segment line:", ">>> $stack[ 0 ]" ); - }; # if - my $attrs = $1; +--- llvm-toolchain-snapshot_19~++20240622104700+f5b93ae5884d.orig/openmp/runtime/tools/check-execstack.py ++++ llvm-toolchain-snapshot_19~++20240622104700+f5b93ae5884d/openmp/runtime/tools/check-execstack.py +@@ -30,7 +30,7 @@ def is_stack_executable_readelf(library) + error("{}: Not stack segment found".format(library)) + if len(stack_lines) > 1: + error("{}: More than one stack segment found".format(library)) +- h = r"0x[0-9a-fA-F]+" ++ h = r"0(?:x[0-9a-f]+)" + m = re.search( + r"((GNU_)?STACK)\s+({0})\s+({0})\s+({0})\s+({0})\s+({0})" + " ([R ][W ][E ])".format(h), From e25eb8feec113dbb3d146e6b01603e4a3c780334 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Sun, 23 Jun 2024 23:58:05 +0200 Subject: [PATCH 110/241] changelog: add note about Intel PT support --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index d1f495f9..6b355984 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; * Disable LLVM testsuite on x32 * Install liborc_rt-x86_64.a on x32 * Install hwasan_symbolize on x32 + [ Norbert Lange ] + * build lldb with Intel PT support on x86, amd64 -- John Paul Adrian Glaubitz Sat, 01 Jun 2024 23:16:14 +0200 From 85d687159702a5900e5ca6bac4d2592acc97ae2e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 26 Jun 2024 09:58:56 +0200 Subject: [PATCH 111/241] rebase of the patch --- debian/patches/clang-tidy-run-bin.diff | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff index 5786c229..814c603e 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -1,19 +1,18 @@ -Index: llvm-toolchain-snapshot_19~++20231101090856+e144ae54dcb9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-snapshot_19~++20240626095617+515e048e36d9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-snapshot_19~++20231101090856+e144ae54dcb9.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-snapshot_19~++20231101090856+e144ae54dcb9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -@@ -260,10 +260,13 @@ def main(): - help="allow alpha checkers from clang-analyzer.", +--- llvm-toolchain-snapshot_19~++20240626095617+515e048e36d9.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py ++++ llvm-toolchain-snapshot_19~++20240626095617+515e048e36d9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +@@ -264,10 +264,12 @@ 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-19', -+ help="path to clang-tidy binary" +- "-clang-tidy-binary", metavar="PATH", help="Path to clang-tidy binary." ++ "-clang-tidy-binary", metavar="PATH", help="Path to clang-tidy binary.", ++ default='clang-tidy-19' ) parser.add_argument( "-clang-apply-replacements-binary", + default='clang-apply-replacements-19', metavar="PATH", - help="path to clang-apply-replacements binary", + help="Path to clang-apply-replacements binary.", ) From 4d1e3fdfae540ff5faed2a469fbb9a3efb74c1c5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 26 Jun 2024 21:18:58 +0200 Subject: [PATCH 112/241] Adjust the clang-X-doc path after the change d7dd778cde84110e38521a6b55dfeb4e1c649ec2 --- debian/changelog | 7 ++++++- debian/clang-X.Y-doc.install.in | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6b355984..57f28ca5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,10 +4,15 @@ llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; * Disable LLVM testsuite on x32 * Install liborc_rt-x86_64.a on x32 * Install hwasan_symbolize on x32 + [ Norbert Lange ] * build lldb with Intel PT support on x86, amd64 - -- John Paul Adrian Glaubitz Sat, 01 Jun 2024 23:16:14 +0200 + [ Sylvestre Ledru ] + * Adjust the clang-X-doc path after the change + d7dd778cde84110e38521a6b55dfeb4e1c649ec2 + + -- Sylvestre Ledru Wed, 26 Jun 2024 21:18:27 +0200 llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp1) experimental; urgency=medium diff --git a/debian/clang-X.Y-doc.install.in b/debian/clang-X.Y-doc.install.in index 20e442da..20f49569 100644 --- a/debian/clang-X.Y-doc.install.in +++ b/debian/clang-X.Y-doc.install.in @@ -1,3 +1,3 @@ -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-doc-default-stylesheet.css -usr/lib/llvm-@LLVM_VERSION@/share/clang/index.js +usr/lib/llvm-@LLVM_VERSION@/share/clang-doc/clang-doc-default-stylesheet.css +usr/lib/llvm-@LLVM_VERSION@/share/clang-doc/index.js From b49172df2bbd6da6120388cf806391c3cc075d37 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 7 Jul 2024 16:51:44 +0200 Subject: [PATCH 113/241] * Pass --package-metadata on distros with supporting linkers (starting with Debian trixie and Ubuntu noble). The package metadata is constructed from the environment variables DEB_BUILD_OS_RELEASE_ID, DEB_SOURCE, DEB_VERSION and DEB_HOST_ARCH. Setting NO_PKG_METADATA=1 disables the generation of the package metadata. --- debian/changelog | 7 ++++ .../patches/link-with-package-metadata.diff | 36 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 44 insertions(+) create mode 100644 debian/patches/link-with-package-metadata.diff diff --git a/debian/changelog b/debian/changelog index 57f28ca5..4709f2d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,13 @@ llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; * Adjust the clang-X-doc path after the change d7dd778cde84110e38521a6b55dfeb4e1c649ec2 + [ Matthias Klose ] + * Pass --package-metadata on distros with supporting linkers (starting + with Debian trixie and Ubuntu noble). + The package metadata is constructed from the environment variables + DEB_BUILD_OS_RELEASE_ID, DEB_SOURCE, DEB_VERSION and DEB_HOST_ARCH. + Setting NO_PKG_METADATA=1 disables the generation of the package metadata. + -- Sylvestre Ledru Wed, 26 Jun 2024 21:18:27 +0200 llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp1) experimental; urgency=medium diff --git a/debian/patches/link-with-package-metadata.diff b/debian/patches/link-with-package-metadata.diff new file mode 100644 index 00000000..a9a8fc01 --- /dev/null +++ b/debian/patches/link-with-package-metadata.diff @@ -0,0 +1,36 @@ +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -287,6 +287,33 @@ Linux::Linux(const Driver &D, const llvm + ExtraOpts.push_back("--build-id"); + #endif + ++ if (Distro.IsDebian() && Distro >= Distro::DebianTrixie ++ || Distro.IsUbuntu() && Distro >= Distro::UbuntuNoble) ++ { ++ const char *deb_build_os_release_id = getenv ("DEB_BUILD_OS_RELEASE_ID"); ++ const char *deb_source = getenv ("DEB_SOURCE"); ++ const char *deb_version = getenv ("DEB_VERSION"); ++ const char *deb_host_arch = getenv ("DEB_HOST_ARCH"); ++ const char *no_pkg_metadata = getenv ("NO_PKG_METADATA"); ++ ++ if (no_pkg_metadata) { ++ // don't issue --package-metadata option ++ } else if (!deb_build_os_release_id && !deb_source && !deb_version && !deb_host_arch) { ++ // no environment set for package metadata ++ } else if (!(deb_build_os_release_id && deb_source && deb_version && deb_host_arch)) { ++ // incomple environment ++ // FIXME: emit error ++ } else { ++ ExtraOpts.push_back(std::string("--package-metadata={") ++ + "\"type\":\"deb\"," ++ + "\"os\":\"" + deb_build_os_release_id + "\"," ++ + "\"name\":\"" + deb_source + "\"," ++ + "\"version\":\"" + deb_version + "\"," ++ + "\"architecture\":\"" + deb_host_arch + "\"" ++ + "}"); ++ } ++ } ++ + // The selection of paths to try here is designed to match the patterns which + // the GCC driver itself uses, as this is part of the GCC-compatible driver. + // This was determined by running GCC in a fake filesystem, creating all diff --git a/debian/patches/series b/debian/patches/series index 7750a277..e305e6bc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -151,3 +151,4 @@ mips/D154390-pre-R6.diff disable-openmp-per-target.diff libsanitizer-timebits.diff offload-disable-static-assert.diff +link-with-package-metadata.diff From e6f8456caad886e28fa9377dae49e9764c11fcc3 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 11 Jul 2024 09:29:12 +0200 Subject: [PATCH 114/241] * Pass --package-metadata on distros with supporting linkers (starting with Debian trixie and Ubuntu noble). The package metadata is constructed from the environment variables ELF_PACKAGE_METADATA. Setting NO_PKG_METADATA=1 disables the generation of the package metadata. --- debian/changelog | 2 +- .../patches/link-with-package-metadata.diff | 20 ++++--------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4709f2d2..da7539f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,7 @@ llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; * Pass --package-metadata on distros with supporting linkers (starting with Debian trixie and Ubuntu noble). The package metadata is constructed from the environment variables - DEB_BUILD_OS_RELEASE_ID, DEB_SOURCE, DEB_VERSION and DEB_HOST_ARCH. + ELF_PACKAGE_METADATA. Setting NO_PKG_METADATA=1 disables the generation of the package metadata. -- Sylvestre Ledru Wed, 26 Jun 2024 21:18:27 +0200 diff --git a/debian/patches/link-with-package-metadata.diff b/debian/patches/link-with-package-metadata.diff index a9a8fc01..b82b5ff4 100644 --- a/debian/patches/link-with-package-metadata.diff +++ b/debian/patches/link-with-package-metadata.diff @@ -1,33 +1,21 @@ --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp -@@ -287,6 +287,33 @@ Linux::Linux(const Driver &D, const llvm +@@ -283,6 +283,21 @@ Linux::Linux(const Driver &D, const llvm ExtraOpts.push_back("--build-id"); #endif + if (Distro.IsDebian() && Distro >= Distro::DebianTrixie + || Distro.IsUbuntu() && Distro >= Distro::UbuntuNoble) + { -+ const char *deb_build_os_release_id = getenv ("DEB_BUILD_OS_RELEASE_ID"); -+ const char *deb_source = getenv ("DEB_SOURCE"); -+ const char *deb_version = getenv ("DEB_VERSION"); -+ const char *deb_host_arch = getenv ("DEB_HOST_ARCH"); ++ const char pkg_metadata = getenv ("ELF_PACKAGE_METADATA"); + const char *no_pkg_metadata = getenv ("NO_PKG_METADATA"); + + if (no_pkg_metadata) { + // don't issue --package-metadata option -+ } else if (!deb_build_os_release_id && !deb_source && !deb_version && !deb_host_arch) { ++ } else if (!pkg_metadata) { + // no environment set for package metadata -+ } else if (!(deb_build_os_release_id && deb_source && deb_version && deb_host_arch)) { -+ // incomple environment -+ // FIXME: emit error + } else { -+ ExtraOpts.push_back(std::string("--package-metadata={") -+ + "\"type\":\"deb\"," -+ + "\"os\":\"" + deb_build_os_release_id + "\"," -+ + "\"name\":\"" + deb_source + "\"," -+ + "\"version\":\"" + deb_version + "\"," -+ + "\"architecture\":\"" + deb_host_arch + "\"" -+ + "}"); ++ ExtraOpts.push_back(std::string("--package-metadata=") + pkg_metadata); + } + } + From abf0bb7e5ec8412cb9cb035731f54c501b07f9b6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 11 Jul 2024 13:35:21 +0200 Subject: [PATCH 115/241] rebase of the patches --- ...pilerrt-build-scudo-standalone-option.diff | 8 +-- debian/patches/disable-openmp-per-target.diff | 8 +-- debian/patches/force-sse2-compiler-rt.diff | 8 +-- .../libclc-fix-prepare_builtins-rpath.diff | 8 +-- .../patches/link-with-package-metadata.diff | 8 ++- debian/patches/llvm-fix-lld-linker-check.diff | 8 +-- .../llvm-runtimes-builtins-build-check.diff | 8 +-- debian/patches/openmp-fix-runtimes-build.diff | 60 +++++++++---------- debian/patches/revert-update-doc.diff | 40 ++++++------- debian/patches/series | 1 - debian/patches/unbreak-atomic-mips.diff | 18 ------ debian/patches/unwind-force-pthread-dl.diff | 8 +-- .../wasm/wasm-compiler-rt-default.diff | 14 ++--- debian/patches/wasm/wasm-ld-path.diff | 8 +-- debian/patches/wasm/wasm-sysroot-usr.diff | 24 ++++---- 15 files changed, 106 insertions(+), 123 deletions(-) delete mode 100644 debian/patches/unbreak-atomic-mips.diff 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 bcb1c397..f20132ab 100644 --- a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff +++ b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff @@ -1,10 +1,10 @@ add option to disable compiler-rt scudo standalone allocator as it is not always supported by all arch profiles such as arm5vt of ARM32 arch -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/compiler-rt/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/CMakeLists.txt -@@ -285,6 +285,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/compiler-rt/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/compiler-rt/CMakeLists.txt +@@ -286,6 +286,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY include(config-ix) diff --git a/debian/patches/disable-openmp-per-target.diff b/debian/patches/disable-openmp-per-target.diff index d672e41d..845e21cc 100644 --- a/debian/patches/disable-openmp-per-target.diff +++ b/debian/patches/disable-openmp-per-target.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240229092005+22f5e30c1798/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240229092005+22f5e30c1798.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240229092005+22f5e30c1798/openmp/CMakeLists.txt -@@ -48,13 +48,13 @@ else() +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt +@@ -51,13 +51,13 @@ else() set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) # When building in tree we install the runtime according to the LLVM settings. diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index 0cf1fb0b..b79948c5 100644 --- a/debian/patches/force-sse2-compiler-rt.diff +++ b/debian/patches/force-sse2-compiler-rt.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/builtins/CMakeLists.txt -@@ -773,6 +773,12 @@ else () +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/compiler-rt/lib/builtins/CMakeLists.txt +@@ -796,6 +796,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 e4cb134c..e50abb9b 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_19~++20240424094944+78ebaa2d798f/libclc/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libclc/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/libclc/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/libclc/CMakeLists.txt -@@ -171,6 +171,9 @@ endif() +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/libclc/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libclc/CMakeLists.txt +@@ -176,6 +176,9 @@ endif() target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) # These were not properly reported in early LLVM and we don't need them target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) diff --git a/debian/patches/link-with-package-metadata.diff b/debian/patches/link-with-package-metadata.diff index b82b5ff4..80b47d85 100644 --- a/debian/patches/link-with-package-metadata.diff +++ b/debian/patches/link-with-package-metadata.diff @@ -1,6 +1,8 @@ ---- a/clang/lib/Driver/ToolChains/Linux.cpp -+++ b/clang/lib/Driver/ToolChains/Linux.cpp -@@ -283,6 +283,21 @@ Linux::Linux(const Driver &D, const llvm +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/Linux.cpp +=================================================================== +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/Linux.cpp +@@ -295,6 +295,21 @@ Linux::Linux(const Driver &D, const llvm ExtraOpts.push_back("--build-id"); #endif diff --git a/debian/patches/llvm-fix-lld-linker-check.diff b/debian/patches/llvm-fix-lld-linker-check.diff index 32779593..91a24bf2 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_19~++20240518075939+219476d20fcd/llvm/cmake/modules/AddLLVM.cmake +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/cmake/modules/AddLLVM.cmake =================================================================== ---- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/llvm/cmake/modules/AddLLVM.cmake -+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/cmake/modules/AddLLVM.cmake -@@ -233,7 +233,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED AND +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/cmake/modules/AddLLVM.cmake ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/cmake/modules/AddLLVM.cmake +@@ -249,7 +249,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/llvm-runtimes-builtins-build-check.diff b/debian/patches/llvm-runtimes-builtins-build-check.diff index 1e0c3bf7..ad3ea911 100644 --- a/debian/patches/llvm-runtimes-builtins-build-check.diff +++ b/debian/patches/llvm-runtimes-builtins-build-check.diff @@ -1,10 +1,10 @@ add a check and only set up and build compiler-rt builtins if they have not been disabled -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/runtimes/CMakeLists.txt -@@ -135,7 +135,12 @@ endfunction() +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt +@@ -137,7 +137,12 @@ endfunction() # is required because the other runtimes need the builtin libraries present # before the just-built compiler can pass the configuration tests. get_compiler_rt_path(compiler_rt_path) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 3fdba7fd..f24ff87b 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -1,11 +1,11 @@ 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 -Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/runtimes/CMakeLists.txt -@@ -247,6 +247,7 @@ function(runtime_default_target) +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt +@@ -249,6 +249,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} -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS} @@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/runtimes/CM -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -557,7 +558,7 @@ if(runtimes) +@@ -625,7 +626,7 @@ if(build_runtimes) # build directory cannot find the C++ headers in certain configurations. # I need to build a mechanism for runtime projects to provide CMake code # that executes at LLVM configuration time to handle this case. @@ -22,11 +22,11 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/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_19~++20240518075939+219476d20fcd/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/CMakeLists.txt -@@ -119,6 +119,28 @@ else() +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt +@@ -122,6 +122,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -55,20 +55,20 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/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_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/cuda/CMakeLists.txt -@@ -33,3 +33,5 @@ else() +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/cuda/CMakeLists.txt +@@ -26,3 +26,5 @@ else() message(STATUS "Not generating NVIDIA tests, no supported devices detected." " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() + +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) -Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMakeLists.txt @@ -38,6 +38,9 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY @@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMak target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR} ) -Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/CMakeLists.txt @@ -326,6 +326,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/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_19~++20240518075939+219476d20fcd/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/src/CMakeLists.txt @@ -151,6 +151,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -106,7 +106,7 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/s else() set(LIBOMP_LINKER_LANGUAGE CXX) endif() -@@ -216,6 +217,8 @@ else() +@@ -220,6 +221,8 @@ else() ) endif() @@ -115,10 +115,10 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/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_19~++20240518075939+219476d20fcd/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/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) @@ -129,11 +129,11 @@ Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) -Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/host/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/host/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/plugins-nextgen/host/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/host/CMakeLists.txt -@@ -31,6 +31,8 @@ else() +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/host/CMakeLists.txt +@@ -27,6 +27,8 @@ else() target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) endif() diff --git a/debian/patches/revert-update-doc.diff b/debian/patches/revert-update-doc.diff index 1f6e9b21..44bfb915 100644 --- a/debian/patches/revert-update-doc.diff +++ b/debian/patches/revert-update-doc.diff @@ -15,10 +15,10 @@ Date: Tue Feb 1 23:13:01 2022 -0800 Differential Revision: https://reviews.llvm.org/D112181 -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extra/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang-tools-extra/docs/conf.py @@ -44,6 +44,15 @@ master_doc = "index" project = "Extra Clang Tools" copyright = "2007-%d, The Clang Team" % date.today().year @@ -47,10 +47,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang-tools-extr # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/docs/conf.py @@ -57,6 +57,15 @@ master_doc = "index" project = "Clang" copyright = "2007-%d, The Clang Team" % date.today().year @@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/docs/conf. # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/lld/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/lld/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/lld/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/lld/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/lld/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/lld/docs/conf.py @@ -43,6 +43,15 @@ master_doc = "index" project = "lld" copyright = "2011-%d, LLVM Project" % date.today().year @@ -99,11 +99,11 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/lld/docs/conf.py # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/cmake/modules/AddSphinxTarget.cmake +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/cmake/modules/AddSphinxTarget.cmake =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/cmake/modules/AddSphinxTarget.cmake -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/cmake/modules/AddSphinxTarget.cmake -@@ -39,10 +39,6 @@ function (add_sphinx_target builder proj +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/cmake/modules/AddSphinxTarget.cmake ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/cmake/modules/AddSphinxTarget.cmake +@@ -40,10 +40,6 @@ function (add_sphinx_target builder proj set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") endif() @@ -114,7 +114,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/cmake/modul add_custom_target(${SPHINX_TARGET_NAME} COMMAND ${CMAKE_COMMAND} -E env ${ARG_ENV_VARS} ${SPHINX_EXECUTABLE} -@@ -50,9 +46,6 @@ function (add_sphinx_target builder proj +@@ -51,9 +47,6 @@ function (add_sphinx_target builder proj -d "${SPHINX_DOC_TREE_DIR}" -q # Quiet: no output other than errors and warnings. -t builder-${builder} # tag for builder @@ -124,10 +124,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/cmake/modul ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested "${ARG_SOURCE_DIR}" # Source "${SPHINX_BUILD_DIR}" # Output -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/llvm/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/docs/conf.py @@ -63,6 +63,15 @@ master_doc = "index" project = "LLVM" copyright = "2003-%d, LLVM Project" % date.today().year @@ -144,10 +144,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/llvm/docs/conf.p # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/polly/docs/conf.py +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/polly/docs/conf.py +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/polly/docs/conf.py @@ -44,6 +44,15 @@ master_doc = "index" project = "Polly" copyright = "2010-%d, The Polly Team" % date.today().year diff --git a/debian/patches/series b/debian/patches/series index e305e6bc..2b71fde0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -121,7 +121,6 @@ scan-build-py-fix-default-bin.diff omp-riscv64.patch lldb/test-disable-lldb-i386.diff -unbreak-atomic-mips.diff llvm-fix-lld-linker-check.diff openmp-fix-runtimes-build.diff libclc-fix-prepare_builtins-rpath.diff diff --git a/debian/patches/unbreak-atomic-mips.diff b/debian/patches/unbreak-atomic-mips.diff deleted file mode 100644 index f5d0cab3..00000000 --- a/debian/patches/unbreak-atomic-mips.diff +++ /dev/null @@ -1,18 +0,0 @@ -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/scudo/standalone/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/scudo/standalone/CMakeLists.txt -@@ -195,6 +195,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH - list(APPEND SCUDO_LINK_LIBS atomic) - endif() - -+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR -+ CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64" OR -+ CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mipsel" OR -+ CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64el") -+ list(APPEND SCUDO_LINK_LIBS atomic) -+endif() -+ - if(COMPILER_RT_HAS_SCUDO_STANDALONE) - add_compiler_rt_object_libraries(RTScudoStandalone - ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH} diff --git a/debian/patches/unwind-force-pthread-dl.diff b/debian/patches/unwind-force-pthread-dl.diff index 89896032..e51974bb 100644 --- a/debian/patches/unwind-force-pthread-dl.diff +++ b/debian/patches/unwind-force-pthread-dl.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libunwind/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libunwind/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libunwind/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libunwind/CMakeLists.txt -@@ -301,14 +301,17 @@ if (MSVC) +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/libunwind/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libunwind/CMakeLists.txt +@@ -303,14 +303,17 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() diff --git a/debian/patches/wasm/wasm-compiler-rt-default.diff b/debian/patches/wasm/wasm-compiler-rt-default.diff index 18f5bdf9..43d8d724 100644 --- a/debian/patches/wasm/wasm-compiler-rt-default.diff +++ b/debian/patches/wasm/wasm-compiler-rt-default.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp -@@ -421,6 +421,18 @@ ToolChain::RuntimeLibType WebAssembly::G +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -457,6 +457,18 @@ ToolChain::RuntimeLibType WebAssembly::G return ToolChain::RLT_CompilerRT; } @@ -21,10 +21,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver ToolChain::CXXStdlibType WebAssembly::GetCXXStdlibType(const ArgList &Args) const { if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) { -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.h @@ -56,6 +56,7 @@ private: llvm::opt::ArgStringList &CC1Args, Action::OffloadKind DeviceOffloadKind) const override; diff --git a/debian/patches/wasm/wasm-ld-path.diff b/debian/patches/wasm/wasm-ld-path.diff index 4a192d0d..61fcede2 100644 --- a/debian/patches/wasm/wasm-ld-path.diff +++ b/debian/patches/wasm/wasm-ld-path.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240319094628+703920d4138d.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp @@ -20,6 +20,11 @@ #include "llvm/Support/Path.h" #include "llvm/Support/VirtualFileSystem.h" @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver using namespace clang::driver; using namespace clang::driver::tools; using namespace clang::driver::toolchains; -@@ -241,7 +246,7 @@ WebAssembly::WebAssembly(const Driver &D +@@ -243,7 +248,7 @@ WebAssembly::WebAssembly(const Driver &D const char *WebAssembly::getDefaultLinker() const { if (getOS() == "wasip2") return "wasm-component-ld"; diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff index d144faf5..0cc694e5 100644 --- a/debian/patches/wasm/wasm-sysroot-usr.diff +++ b/debian/patches/wasm/wasm-sysroot-usr.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.cpp -@@ -222,7 +222,7 @@ WebAssembly::WebAssembly(const Driver &D +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -224,7 +224,7 @@ WebAssembly::WebAssembly(const Driver &D getProgramPaths().push_back(getDriver().Dir); @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver if (getTriple().getOS() == llvm::Triple::UnknownOS) { // Theoretically an "unknown" OS should mean no standard libraries, however // it could also mean that a custom set of libraries is in use, so just add -@@ -454,6 +454,7 @@ void WebAssembly::AddClangSystemIncludeA +@@ -490,6 +490,7 @@ void WebAssembly::AddClangSystemIncludeA return; const Driver &D = getDriver(); @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { SmallString<128> P(D.ResourceDir); -@@ -477,12 +478,20 @@ void WebAssembly::AddClangSystemIncludeA +@@ -513,12 +514,20 @@ void WebAssembly::AddClangSystemIncludeA return; } @@ -43,7 +43,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver } void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, -@@ -533,6 +542,17 @@ Tool *WebAssembly::buildLinker() const { +@@ -569,6 +578,17 @@ Tool *WebAssembly::buildLinker() const { return new tools::wasm::Linker(*this); } @@ -61,7 +61,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver void WebAssembly::addLibCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { -@@ -543,18 +563,22 @@ void WebAssembly::addLibCxxIncludePaths( +@@ -579,18 +599,22 @@ void WebAssembly::addLibCxxIncludePaths( getMultiarchTriple(D, getTriple(), SysRoot); bool IsKnownOs = (getTriple().getOS() != llvm::Triple::UnknownOS); @@ -91,7 +91,7 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver } void WebAssembly::addLibStdCXXIncludePaths( -@@ -601,8 +625,11 @@ void WebAssembly::addLibStdCXXIncludePat +@@ -637,8 +661,11 @@ void WebAssembly::addLibStdCXXIncludePat addSystemInclude(DriverArgs, CC1Args, TargetDir); } @@ -107,10 +107,10 @@ Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver + addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward"); + } } -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/clang/lib/Driver/ToolChains/WebAssembly.h -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/clang/lib/Driver/ToolChains/WebAssembly.h +--- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/WebAssembly.h @@ -84,6 +84,8 @@ private: llvm::opt::ArgStringList &CC1Args) const; void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs, From 2833eb79e1adb218ad2300c891c3a1192025382c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 14 Jul 2024 18:06:47 +0200 Subject: [PATCH 116/241] Revert " * Pass --package-metadata on distros with supporting linkers (starting" This reverts commit e6f8456caad886e28fa9377dae49e9764c11fcc3. --- debian/changelog | 2 +- debian/patches/link-with-package-metadata.diff | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index da7539f5..4709f2d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,7 @@ llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; * Pass --package-metadata on distros with supporting linkers (starting with Debian trixie and Ubuntu noble). The package metadata is constructed from the environment variables - ELF_PACKAGE_METADATA. + DEB_BUILD_OS_RELEASE_ID, DEB_SOURCE, DEB_VERSION and DEB_HOST_ARCH. Setting NO_PKG_METADATA=1 disables the generation of the package metadata. -- Sylvestre Ledru Wed, 26 Jun 2024 21:18:27 +0200 diff --git a/debian/patches/link-with-package-metadata.diff b/debian/patches/link-with-package-metadata.diff index 80b47d85..d2d789e7 100644 --- a/debian/patches/link-with-package-metadata.diff +++ b/debian/patches/link-with-package-metadata.diff @@ -9,15 +9,27 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver + if (Distro.IsDebian() && Distro >= Distro::DebianTrixie + || Distro.IsUbuntu() && Distro >= Distro::UbuntuNoble) + { -+ const char pkg_metadata = getenv ("ELF_PACKAGE_METADATA"); ++ const char *deb_build_os_release_id = getenv ("DEB_BUILD_OS_RELEASE_ID"); ++ const char *deb_source = getenv ("DEB_SOURCE"); ++ const char *deb_version = getenv ("DEB_VERSION"); ++ const char *deb_host_arch = getenv ("DEB_HOST_ARCH"); + const char *no_pkg_metadata = getenv ("NO_PKG_METADATA"); + + if (no_pkg_metadata) { + // don't issue --package-metadata option -+ } else if (!pkg_metadata) { ++ } else if (!deb_build_os_release_id && !deb_source && !deb_version && !deb_host_arch) { + // no environment set for package metadata ++ } else if (!(deb_build_os_release_id && deb_source && deb_version && deb_host_arch)) { ++ // incomple environment ++ // FIXME: emit error + } else { -+ ExtraOpts.push_back(std::string("--package-metadata=") + pkg_metadata); ++ ExtraOpts.push_back(std::string("--package-metadata={") ++ + "\"type\":\"deb\"," ++ + "\"os\":\"" + deb_build_os_release_id + "\"," ++ + "\"name\":\"" + deb_source + "\"," ++ + "\"version\":\"" + deb_version + "\"," ++ + "\"architecture\":\"" + deb_host_arch + "\"" ++ + "}"); + } + } + From 75e74aeaf0b99855b649a2dea0f8796892d284b6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 14 Jul 2024 18:47:23 +0200 Subject: [PATCH 117/241] rebase of the patch --- .../patches/link-with-package-metadata.diff | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/patches/link-with-package-metadata.diff b/debian/patches/link-with-package-metadata.diff index d2d789e7..307787a7 100644 --- a/debian/patches/link-with-package-metadata.diff +++ b/debian/patches/link-with-package-metadata.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/Linux.cpp +Index: llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b/clang/lib/Driver/ToolChains/Linux.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/clang/lib/Driver/ToolChains/Linux.cpp -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver/ToolChains/Linux.cpp -@@ -295,6 +295,21 @@ Linux::Linux(const Driver &D, const llvm +--- llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -295,6 +295,33 @@ Linux::Linux(const Driver &D, const llvm ExtraOpts.push_back("--build-id"); #endif @@ -24,12 +24,12 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/clang/lib/Driver + // FIXME: emit error + } else { + ExtraOpts.push_back(std::string("--package-metadata={") -+ + "\"type\":\"deb\"," -+ + "\"os\":\"" + deb_build_os_release_id + "\"," -+ + "\"name\":\"" + deb_source + "\"," -+ + "\"version\":\"" + deb_version + "\"," -+ + "\"architecture\":\"" + deb_host_arch + "\"" -+ + "}"); ++ + "\"type\":\"deb\"," ++ + "\"os\":\"" + deb_build_os_release_id + "\"," ++ + "\"name\":\"" + deb_source + "\"," ++ + "\"version\":\"" + deb_version + "\"," ++ + "\"architecture\":\"" + deb_host_arch + "\"" ++ + "}"); + } + } + From ec4e455998dfa8bf67666e41a73d4a2ac6447646 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 14 Jul 2024 18:55:20 +0200 Subject: [PATCH 118/241] rebase of the patch --- .../llvm-runtimes-builtins-build-check.diff | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/patches/llvm-runtimes-builtins-build-check.diff b/debian/patches/llvm-runtimes-builtins-build-check.diff index ad3ea911..cc84b038 100644 --- a/debian/patches/llvm-runtimes-builtins-build-check.diff +++ b/debian/patches/llvm-runtimes-builtins-build-check.diff @@ -1,10 +1,10 @@ add a check and only set up and build compiler-rt builtins if they have not been disabled -Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt -@@ -137,7 +137,12 @@ endfunction() +--- llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b/llvm/runtimes/CMakeLists.txt +@@ -142,10 +142,15 @@ endfunction() # is required because the other runtimes need the builtin libraries present # before the just-built compiler can pass the configuration tests. get_compiler_rt_path(compiler_rt_path) @@ -15,6 +15,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CM + set(RUNTIMES_BUILD_BUILTINS ${COMPILER_RT_BUILD_BUILTINS}) +endif() +if(compiler_rt_path AND RUNTIMES_BUILD_BUILTINS) - if(NOT LLVM_BUILTIN_TARGETS) - builtin_default_target(${compiler_rt_path} - DEPENDS clang-resource-headers) + # If the user did not specify the targets infer them from the runtimes. + set(builtin_targets ${LLVM_BUILTIN_TARGETS}) +- if(NOT builtin_targets) ++ if(NOT LLVM_BUILTIN_TARGETS) + if("compiler-rt" IN_LIST LLVM_ENABLE_RUNTIMES) + list(APPEND builtin_targets "default") + endif() From 5490d743ab154bd920f1bd3a46320c5aedbfa8b6 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 15 Jul 2024 10:00:40 +0200 Subject: [PATCH 119/241] * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. --- debian/changelog | 2 +- .../patches/link-with-package-metadata.diff | 26 +++++-------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4709f2d2..da7539f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,7 @@ llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; * Pass --package-metadata on distros with supporting linkers (starting with Debian trixie and Ubuntu noble). The package metadata is constructed from the environment variables - DEB_BUILD_OS_RELEASE_ID, DEB_SOURCE, DEB_VERSION and DEB_HOST_ARCH. + ELF_PACKAGE_METADATA. Setting NO_PKG_METADATA=1 disables the generation of the package metadata. -- Sylvestre Ledru Wed, 26 Jun 2024 21:18:27 +0200 diff --git a/debian/patches/link-with-package-metadata.diff b/debian/patches/link-with-package-metadata.diff index 307787a7..1f413758 100644 --- a/debian/patches/link-with-package-metadata.diff +++ b/debian/patches/link-with-package-metadata.diff @@ -1,35 +1,21 @@ -Index: llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b/clang/lib/Driver/ToolChains/Linux.cpp -=================================================================== ---- llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b.orig/clang/lib/Driver/ToolChains/Linux.cpp -+++ llvm-toolchain-snapshot_19~++20240714063407+a72eed7a238b/clang/lib/Driver/ToolChains/Linux.cpp -@@ -295,6 +295,33 @@ Linux::Linux(const Driver &D, const llvm +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -287,6 +287,21 @@ Linux::Linux(const Driver &D, const llvm ExtraOpts.push_back("--build-id"); #endif + if (Distro.IsDebian() && Distro >= Distro::DebianTrixie + || Distro.IsUbuntu() && Distro >= Distro::UbuntuNoble) + { -+ const char *deb_build_os_release_id = getenv ("DEB_BUILD_OS_RELEASE_ID"); -+ const char *deb_source = getenv ("DEB_SOURCE"); -+ const char *deb_version = getenv ("DEB_VERSION"); -+ const char *deb_host_arch = getenv ("DEB_HOST_ARCH"); ++ const char *pkg_metadata = getenv ("ELF_PACKAGE_METADATA"); + const char *no_pkg_metadata = getenv ("NO_PKG_METADATA"); + + if (no_pkg_metadata) { + // don't issue --package-metadata option -+ } else if (!deb_build_os_release_id && !deb_source && !deb_version && !deb_host_arch) { ++ } else if (!pkg_metadata) { + // no environment set for package metadata -+ } else if (!(deb_build_os_release_id && deb_source && deb_version && deb_host_arch)) { -+ // incomple environment -+ // FIXME: emit error + } else { -+ ExtraOpts.push_back(std::string("--package-metadata={") -+ + "\"type\":\"deb\"," -+ + "\"os\":\"" + deb_build_os_release_id + "\"," -+ + "\"name\":\"" + deb_source + "\"," -+ + "\"version\":\"" + deb_version + "\"," -+ + "\"architecture\":\"" + deb_host_arch + "\"" -+ + "}"); ++ ExtraOpts.push_back(std::string("--package-metadata=") + pkg_metadata); + } + } + From fa1eda2885b8739893ec202fe8a69930770367ff Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 23 Jul 2024 22:37:31 +0200 Subject: [PATCH 120/241] prepare 19 --- debian/changelog | 7 +++++-- debian/control | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index da7539f5..93e7440e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19~++20240723103123+d0c8e268c1ed-1~exp1) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Disable LLVM testsuite on x32 @@ -19,7 +19,10 @@ llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp2) UNRELEASED; ELF_PACKAGE_METADATA. Setting NO_PKG_METADATA=1 disables the generation of the package metadata. - -- Sylvestre Ledru Wed, 26 Jun 2024 21:18:27 +0200 + [ Sylvestre Ledru ] + * experimental New snapshot release + + -- Sylvestre Ledru Tue, 23 Jul 2024 22:31:34 +0200 llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 953d8b3a..2ed8e5a3 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-snapshot +Source: llvm-toolchain-19 Section: devel Priority: optional Rules-Requires-Root: no @@ -38,8 +38,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, Build-Conflicts: oprofile Standards-Version: 4.6.2 Homepage: https://www.llvm.org/ -Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot -Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot +Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 19 +Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/19 # ------------- clang ------------- From f38665dde99f15d922524310af19a8e1ba51fdca Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jul 2024 00:01:19 +0200 Subject: [PATCH 121/241] fix the version --- debian/unpack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/unpack.sh b/debian/unpack.sh index 666094eb..54250cb1 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -1,5 +1,5 @@ set -e -ORIG_VERSION=snapshot +ORIG_VERSION=19 MAJOR_VERSION=19 # 8.0.1 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru` From d5de564123b368b7eb182fe76ef289568a525780 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jul 2024 14:51:10 +0200 Subject: [PATCH 122/241] bring back clang-nvlink-wrapper following upstream commit: 37d0568a6593adfe791c1327d99731050540e97a --- debian/changelog | 10 +++++----- debian/clang-tools-X.Y.install.in | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93e7440e..e42676b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19~++20240723103123+d0c8e268c1ed-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:20~++20240723104014+d0c8e268c1ed-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] * Disable LLVM testsuite on x32 @@ -9,8 +9,11 @@ llvm-toolchain-19 (1:19~++20240723103123+d0c8e268c1ed-1~exp1) UNRELEASED; urgenc * build lldb with Intel PT support on x86, amd64 [ Sylvestre Ledru ] + * Prepare upload to 19 * Adjust the clang-X-doc path after the change d7dd778cde84110e38521a6b55dfeb4e1c649ec2 + * bring back clang-nvlink-wrapper + following upstream commit: 37d0568a6593adfe791c1327d99731050540e97a [ Matthias Klose ] * Pass --package-metadata on distros with supporting linkers (starting @@ -19,10 +22,7 @@ llvm-toolchain-19 (1:19~++20240723103123+d0c8e268c1ed-1~exp1) UNRELEASED; urgenc ELF_PACKAGE_METADATA. Setting NO_PKG_METADATA=1 disables the generation of the package metadata. - [ Sylvestre Ledru ] - * experimental New snapshot release - - -- Sylvestre Ledru Tue, 23 Jul 2024 22:31:34 +0200 + -- Sylvestre Ledru Wed, 26 Jun 2024 21:18:27 +0200 llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp1) experimental; urgency=medium diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 21a19810..dbde4de9 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -39,6 +39,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-include-cleaner usr/lib/llvm-@LLVM_VERSION@/bin/amdgpu-arch usr/lib/llvm-@LLVM_VERSION@/bin/nvptx-arch usr/lib/llvm-@LLVM_VERSION@/bin/clang-installapi +usr/lib/llvm-@LLVM_VERSION@/bin/clang-nvlink-wrapper usr/lib/llvm-@LLVM_VERSION@/bin/analyze-build usr/lib/llvm-@LLVM_VERSION@/bin/intercept-build @@ -107,3 +108,4 @@ usr/bin/clang-include-cleaner-@LLVM_VERSION@ usr/bin/amdgpu-arch-@LLVM_VERSION@ usr/bin/nvptx-arch-@LLVM_VERSION@ usr/bin/clang-installapi-@LLVM_VERSION@ +usr/bin/clang-nvlink-wrapper-@LLVM_VERSION@ From 07480879d8f1b2164efeaede60377eb30a7eceaf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 25 Jul 2024 23:16:52 +0200 Subject: [PATCH 123/241] ship llvm-cgdata --- debian/changelog | 1 + debian/llvm-X.Y-tools.install.in | 1 - debian/llvm-X.Y.install.in | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e42676b5..d3c7e941 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ llvm-toolchain-snapshot (1:20~++20240723104014+d0c8e268c1ed-1~exp1) experimental d7dd778cde84110e38521a6b55dfeb4e1c649ec2 * bring back clang-nvlink-wrapper following upstream commit: 37d0568a6593adfe791c1327d99731050540e97a + * ship llvm-cgdata [ Matthias Klose ] * Pass --package-metadata on distros with supporting linkers (starting diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in index 92cc7c2f..2aecaa4b 100644 --- a/debian/llvm-X.Y-tools.install.in +++ b/debian/llvm-X.Y-tools.install.in @@ -1,4 +1,3 @@ - usr/lib/llvm-@LLVM_VERSION@/bin/count usr/lib/llvm-@LLVM_VERSION@/bin/FileCheck usr/lib/llvm-@LLVM_VERSION@/bin/not diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index 81ff8ad7..1553b82a 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -82,6 +82,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remarkutil usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfo-analyzer usr/lib/llvm-@LLVM_VERSION@/bin/llvm-readtapi usr/lib/llvm-@LLVM_VERSION@/bin/reduce-chunk-list +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cgdata usr/bin/llvm-PerfectShuffle-@LLVM_VERSION@ usr/bin/llvm-addr2line-@LLVM_VERSION@ @@ -162,3 +163,4 @@ usr/bin/llvm-debuginfod-find-* usr/bin/llvm-debuginfod-@LLVM_VERSION@ usr/bin/llvm-debuginfo-analyzer-@LLVM_VERSION@ usr/bin/reduce-chunk-list-@LLVM_VERSION@ +usr/bin/llvm-cgdata-@LLVM_VERSION@ From 6931d6a27075daed6134dca196fbce2cf85cd34b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 25 Jul 2024 23:17:15 +0200 Subject: [PATCH 124/241] fix changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d3c7e941..19d311f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:20~++20240723104014+d0c8e268c1ed-1~exp1) experimental; urgency=medium +llvm-toolchain-19 (1:19.1.0~++20240724103243+7af27be6633a-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] * Disable LLVM testsuite on x32 From ef6f66c73a53bb147eb6d850c59dd3a180a7e139 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 28 Jul 2024 21:39:27 +0200 Subject: [PATCH 125/241] fix version --- debian/changelog | 2 +- debian/orig-tar.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 19d311f6..72aa0920 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,7 +23,7 @@ llvm-toolchain-19 (1:19.1.0~++20240724103243+7af27be6633a-1~exp1) experimental; ELF_PACKAGE_METADATA. Setting NO_PKG_METADATA=1 disables the generation of the package metadata. - -- Sylvestre Ledru Wed, 26 Jun 2024 21:18:27 +0200 + -- Sylvestre Ledru Sun, 28 Jul 2024 21:39:57 +0200 llvm-toolchain-snapshot (1:19~++20240529093513+2cfea14a57ad-1~exp1) experimental; urgency=medium diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index bca132c1..3b98f53c 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -131,12 +131,13 @@ if test -z "$TAG" -a -z "$FINAL_RELEASE"; then # In general, in Debian, we will keep X until X.0.1 is released (or rc in experimental) # However, on apt.llvm.org, we will update the version to have X.0.1 # This code is doing that. - CURRENT_VERSION="$(grep -oP 'set\(\s*LLVM_VERSION_(MAJOR|MINOR|PATCH)\s\K[0-9]+' llvm/CMakeLists.txt | paste -sd '.')" + CURRENT_VERSION="$(grep -oP 'set\(\s*LLVM_VERSION_(MAJOR|MINOR|PATCH)\s\K[0-9]+' cmake/Modules/LLVMVersion.cmake | paste -sd '.')" fi # the + is here to make sure that this version is considered more recent than the svn # dpkg --compare-versions 10~svn374977-1~exp1 lt 10~+2019-svn374977-1~exp1 # to verify that VERSION="${CURRENT_VERSION}~++$(date +'%Y%m%d%I%M%S')+$(git log -1 --pretty=format:'%h')" + echo "CURRENT = ${CURRENT_VERSION}" else if ! echo "$EXACT_VERSION"|grep -q "$MAJOR_VERSION"; then @@ -160,7 +161,6 @@ rm -rf */www/ build/ build-llvm/ cd ../ BASE="llvm-toolchain-${MAJOR_VERSION}_${VERSION}" FILENAME="${BASE}.orig.tar.xz" - cp -R llvm-toolchain-integration-test-suite llvm-project/integration-test-suite # Argument to compress faster (for the cost of time) export XZ_OPT="-4 -T$(nproc)" From 7bbc73cbe15c6904e3ba7ec68742d2cfc07ad376 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 28 Jul 2024 21:44:04 +0200 Subject: [PATCH 126/241] rebase of these patches --- .../libcxx-test-fix-lockfree-test-for-i386.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch index c7b97eeb..44c531ec 100644 --- a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch +++ b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch @@ -10,16 +10,16 @@ To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 defi Bug: https://llvm.org/bugs/show_bug.cgi?id=19355 -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp +Index: llvm-toolchain-snapshot_20~++20240727010229+4f5ad22b95ba/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -@@ -18,6 +18,14 @@ - +--- llvm-toolchain-snapshot_20~++20240727010229+4f5ad22b95ba.orig/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.cpp ++++ llvm-toolchain-snapshot_20~++20240727010229+4f5ad22b95ba/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.cpp +@@ -22,6 +22,14 @@ #include "test_macros.h" + #include "atomic_helpers.h" +#if defined(__i386__) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) -+/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorecctly for x86 ++/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorrectly for x86 + * https://llvm.org/bugs/show_bug.cgi?id=19355 + */ +#undef ATOMIC_LLONG_LOCK_FREE @@ -27,5 +27,5 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/test/std/ +#endif + template - void checkAlwaysLockFree() { - if (std::atomic::is_always_lock_free) { + void check_always_lock_free(std::atomic const& a) { + using InfoT = LockFreeStatusInfo; From e5e85cd1940b58f574f1ca57b3d6a2054fa0791e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 1 Aug 2024 12:15:06 +0200 Subject: [PATCH 127/241] Drop mips D154390 patch, already upstream --- debian/patches/mips/D154390-pre-R6.diff | 41 ------------------------- debian/patches/series | 2 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 debian/patches/mips/D154390-pre-R6.diff diff --git a/debian/patches/mips/D154390-pre-R6.diff b/debian/patches/mips/D154390-pre-R6.diff deleted file mode 100644 index e31d8078..00000000 --- a/debian/patches/mips/D154390-pre-R6.diff +++ /dev/null @@ -1,41 +0,0 @@ -see https://reviews.llvm.org/D158491, still unreviewed upstream - -Index: llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -=================================================================== ---- llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -+++ llvm-toolchain-snapshot_19~++20240424094944+78ebaa2d798f/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -@@ -54,6 +54,8 @@ - - #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__) - # define ASM_TAIL_CALL jmp -+#elif defined(__mips__) && __mips_isa_rev >= 6 -+# define ASM_TAIL_CALL bc - #elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ - defined(__powerpc__) || defined(__loongarch_lp64) - # define ASM_TAIL_CALL b -@@ -86,6 +88,25 @@ - SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " i_func - #endif - -+#if defined(__mips64) && __mips_isa_rev < 6 -+# define C_ASM_TAIL_CALL(tfunc, ifunc) \ -+ "lui $t8, %hi(%neg(%gp_rel(" tfunc ")))\n" \ -+ "daddu $t8, $t8, $t9\n" \ -+ "daddu $t8, $t8, %lo(%neg(%gp_rel(" tfunc ")))\n" \ -+ "ld $t9, %got_disp(" ifunc ")($t8)\n" \ -+ "jr $t9\n" -+#elif defined(__mips__) && __mips_isa_rev < 6 -+# define C_ASM_TAIL_CALL(tfunc, ifunc) \ -+ ".set noreorder\n" \ -+ ".cpload $t9\n" \ -+ ".set reorder\n" \ -+ "lw $t9, %got(" ifunc ")($gp)\n" \ -+ "jr $t9\n" -+#elif defined(ASM_TAIL_CALL) -+# define C_ASM_TAIL_CALL(tfunc, ifunc) \ -+ SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " ifunc -+#endif -+ - #if defined(__ELF__) && defined(__x86_64__) || defined(__i386__) || \ - defined(__riscv) - # define ASM_PREEMPTIBLE_SYM(sym) sym@plt diff --git a/debian/patches/series b/debian/patches/series index 2b71fde0..7954e83a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -139,6 +139,7 @@ wasm/wasm-compiler-rt-default.diff wasm/wasm-sysroot-usr.diff revert-update-doc.diff + unwind-force-pthread-dl.diff force-sse2-compiler-rt.diff bolt-disable-emit-relocs.patch @@ -146,7 +147,6 @@ link-grpc.diff libclang-major-version-only.diff D148945-revert.diff arm32-defaults.diff -mips/D154390-pre-R6.diff disable-openmp-per-target.diff libsanitizer-timebits.diff offload-disable-static-assert.diff From 171ca627f1119f51c5bd9461743b69d61f5a11c9 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 6 Aug 2024 16:26:58 +0200 Subject: [PATCH 128/241] * ld.lld: When no package-metadata option is given, fall-back to the envvar ELF_PACKAGE_METADATA. --- debian/changelog | 13 +++++++++++++ debian/patches/env-lld-package-metadata.diff | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 30 insertions(+) create mode 100644 debian/patches/env-lld-package-metadata.diff diff --git a/debian/changelog b/debian/changelog index 72aa0920..c14005b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +llvm-toolchain-19 (1:19.1.0~++rc2-1~exp2) UNRELEASED; urgency=medium + + * ld.lld: When no package-metadata option is given, fall-back + to the envvar ELF_PACKAGE_METADATA. + + -- Matthias Klose Tue, 06 Aug 2024 16:24:53 +0200 + +llvm-toolchain-19 (1:19.1.0~++rc2-1~exp1) experimental; urgency=medium + + * New testing release + + -- Sylvestre Ledru Mon, 05 Aug 2024 15:25:06 +0200 + llvm-toolchain-19 (1:19.1.0~++20240724103243+7af27be6633a-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] diff --git a/debian/patches/env-lld-package-metadata.diff b/debian/patches/env-lld-package-metadata.diff new file mode 100644 index 00000000..2eb1e0b1 --- /dev/null +++ b/debian/patches/env-lld-package-metadata.diff @@ -0,0 +1,16 @@ +--- a/lld/ELF/Driver.cpp ++++ b/lld/ELF/Driver.cpp +@@ -1335,6 +1335,13 @@ static void readConfigs(opt::InputArgLis + config->orphanHandling = getOrphanHandling(args); + config->outputFile = args.getLastArgValue(OPT_o); + config->packageMetadata = args.getLastArgValue(OPT_package_metadata); ++ // No package-metadata option, fall-back to env ELF_PACKAGE_METADATA ++ if (config->packageMetadata.empty()) { ++ const char *env_package_metadata = getenv("ELF_PACKAGE_METADATA"); ++ if (env_package_metadata && strcmp(env_package_metadata, "") != 0) { ++ config->packageMetadata = StringRef(env_package_metadata); ++ } ++ } + config->pie = args.hasFlag(OPT_pie, OPT_no_pie, false); + config->printIcfSections = + args.hasFlag(OPT_print_icf_sections, OPT_no_print_icf_sections, false); diff --git a/debian/patches/series b/debian/patches/series index 7954e83a..70ae62c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -151,3 +151,4 @@ disable-openmp-per-target.diff libsanitizer-timebits.diff offload-disable-static-assert.diff link-with-package-metadata.diff +env-lld-package-metadata.diff From eb75a69cb0464e8cb294e1fbcb7fa87fc41a0bec Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Thu, 15 Aug 2024 10:43:18 +0200 Subject: [PATCH 129/241] Enable bolt on arm64, now supported upstream --- debian/changelog | 6 +++++- debian/control | 6 ++---- debian/control.in | 6 ++---- debian/libbolt-X.Y-dev.install.in | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index c14005b2..b09d0b24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ llvm-toolchain-19 (1:19.1.0~++rc2-1~exp2) UNRELEASED; urgency=medium + [ Matthias Klose ] * ld.lld: When no package-metadata option is given, fall-back to the envvar ELF_PACKAGE_METADATA. - -- Matthias Klose Tue, 06 Aug 2024 16:24:53 +0200 + [ Emanuele Rocca ] + * Enable bolt on arm64, now supported upstream. + + -- Matthias Klose Tue, 06 Aug 2024 16:13:21 +0200 llvm-toolchain-19 (1:19.1.0~++rc2-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 2ed8e5a3..216285dd 100644 --- a/debian/control +++ b/debian/control @@ -913,8 +913,7 @@ Description: Multi-Level Intermediate Representation library # ------------- bolt ------------- Package: bolt-19 -Architecture: amd64 -# Disable on arm64 because libbolt_rt_hugify.a isn't generated +Architecture: amd64 arm64 Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-19-dev (= ${binary:Version}), Pre-Depends: ${misc:Pre-Depends} Description: Post-link optimizer @@ -923,8 +922,7 @@ Description: Post-link optimizer Package: libbolt-19-dev Section: libdevel -Architecture: amd64 -#arm64 +Architecture: amd64 arm64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: Post-link optimizer It achieves the improvements by optimizing application's code layout based on diff --git a/debian/control.in b/debian/control.in index edfb213f..1635ad33 100644 --- a/debian/control.in +++ b/debian/control.in @@ -913,8 +913,7 @@ Description: Multi-Level Intermediate Representation library # ------------- bolt ------------- Package: bolt-@LLVM_VERSION@ -Architecture: amd64 -# Disable on arm64 because libbolt_rt_hugify.a isn't generated +Architecture: amd64 arm64 Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-@LLVM_VERSION@-dev (= ${binary:Version}), Pre-Depends: ${misc:Pre-Depends} Description: Post-link optimizer @@ -923,8 +922,7 @@ Description: Post-link optimizer Package: libbolt-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 -#arm64 +Architecture: amd64 arm64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: Post-link optimizer It achieves the improvements by optimizing application's code layout based on diff --git a/debian/libbolt-X.Y-dev.install.in b/debian/libbolt-X.Y-dev.install.in index 5e75263f..f4ce706d 100644 --- a/debian/libbolt-X.Y-dev.install.in +++ b/debian/libbolt-X.Y-dev.install.in @@ -1,4 +1,4 @@ #!/usr/bin/dh-exec -[amd64] /usr/lib/llvm-@LLVM_VERSION@/lib/libbolt_rt_hugify.a -[amd64] /usr/lib/llvm-@LLVM_VERSION@/lib/libbolt_rt_instr.a +[amd64 arm64] /usr/lib/llvm-@LLVM_VERSION@/lib/libbolt_rt_hugify.a +[amd64 arm64] /usr/lib/llvm-@LLVM_VERSION@/lib/libbolt_rt_instr.a From 5ba64c33930e9a3b30c3d5a9bca0903da4930a05 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 5 Aug 2024 15:26:48 +0200 Subject: [PATCH 130/241] prepare release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b09d0b24..6353c405 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,12 @@ llvm-toolchain-19 (1:19.1.0~++rc2-1~exp1) experimental; urgency=medium -- Sylvestre Ledru Mon, 05 Aug 2024 15:25:06 +0200 +llvm-toolchain-19 (1:19.1.0~+rc2-1~exp1) UNRELEASED; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Mon, 05 Aug 2024 15:25:06 +0200 + llvm-toolchain-19 (1:19.1.0~++20240724103243+7af27be6633a-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] From d9e1383f54f980dc6edd8c6b21a61814287fd963 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 5 Aug 2024 15:30:37 +0200 Subject: [PATCH 131/241] prepare release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6353c405..07f4f92c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,9 +15,9 @@ llvm-toolchain-19 (1:19.1.0~++rc2-1~exp1) experimental; urgency=medium -- Sylvestre Ledru Mon, 05 Aug 2024 15:25:06 +0200 -llvm-toolchain-19 (1:19.1.0~+rc2-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~+rc2-1~exp1) experimental; urgency=medium - * New snapshot release + * New testing release -- Sylvestre Ledru Mon, 05 Aug 2024 15:25:06 +0200 From 54a1412a54faf738ef22c3b7fe143ca343386e2b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 19 Aug 2024 17:26:32 +0200 Subject: [PATCH 132/241] remove llvm-cgdata - see 9e90c40564e21dc5f1a12e08cfdf29305aaf9f50 --- debian/changelog | 11 ++++------- debian/llvm-X.Y.install.in | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07f4f92c..38555b6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,10 @@ llvm-toolchain-19 (1:19.1.0~++rc2-1~exp2) UNRELEASED; urgency=medium [ Emanuele Rocca ] * Enable bolt on arm64, now supported upstream. - -- Matthias Klose Tue, 06 Aug 2024 16:13:21 +0200 + [ Sylvestre Ledru ] + * remove llvm-cgdata - see 9e90c40564e21dc5f1a12e08cfdf29305aaf9f50 + + -- Sylvestre Ledru Mon, 19 Aug 2024 17:26:06 +0200 llvm-toolchain-19 (1:19.1.0~++rc2-1~exp1) experimental; urgency=medium @@ -15,12 +18,6 @@ llvm-toolchain-19 (1:19.1.0~++rc2-1~exp1) experimental; urgency=medium -- Sylvestre Ledru Mon, 05 Aug 2024 15:25:06 +0200 -llvm-toolchain-19 (1:19.1.0~+rc2-1~exp1) experimental; urgency=medium - - * New testing release - - -- Sylvestre Ledru Mon, 05 Aug 2024 15:25:06 +0200 - llvm-toolchain-19 (1:19.1.0~++20240724103243+7af27be6633a-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index 1553b82a..81ff8ad7 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -82,7 +82,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remarkutil usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfo-analyzer usr/lib/llvm-@LLVM_VERSION@/bin/llvm-readtapi usr/lib/llvm-@LLVM_VERSION@/bin/reduce-chunk-list -usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cgdata usr/bin/llvm-PerfectShuffle-@LLVM_VERSION@ usr/bin/llvm-addr2line-@LLVM_VERSION@ @@ -163,4 +162,3 @@ usr/bin/llvm-debuginfod-find-* usr/bin/llvm-debuginfod-@LLVM_VERSION@ usr/bin/llvm-debuginfo-analyzer-@LLVM_VERSION@ usr/bin/reduce-chunk-list-@LLVM_VERSION@ -usr/bin/llvm-cgdata-@LLVM_VERSION@ From df7e9b34f084c6b0f4c5d746e64b1091807a95cc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Aug 2024 20:02:13 +0200 Subject: [PATCH 133/241] New snapshot release --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38555b6c..11449a1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0~++rc2-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc3-1~exp1) experimental; urgency=medium [ Matthias Klose ] * ld.lld: When no package-metadata option is given, fall-back @@ -9,8 +9,9 @@ llvm-toolchain-19 (1:19.1.0~++rc2-1~exp2) UNRELEASED; urgency=medium [ Sylvestre Ledru ] * remove llvm-cgdata - see 9e90c40564e21dc5f1a12e08cfdf29305aaf9f50 + * New snapshot release - -- Sylvestre Ledru Mon, 19 Aug 2024 17:26:06 +0200 + -- Sylvestre Ledru Tue, 20 Aug 2024 19:52:02 +0200 llvm-toolchain-19 (1:19.1.0~++rc2-1~exp1) experimental; urgency=medium From 2b026ab24cc25e3f2c01109dc8e97744e543c534 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 11:50:21 +0200 Subject: [PATCH 134/241] * Add a .gitignore file with all toplevel upstream files and directories. --- .gitignore | 41 +++++++++++++++++++++++++++++++++++++++++ debian/changelog | 6 ++++++ 2 files changed, 47 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f371bbfd --- /dev/null +++ b/.gitignore @@ -0,0 +1,41 @@ +.ci +.clang-format +.clang-tidy +.git +.git-blame-ignore-revs +.gitattributes +.github +.mailmap + +CODE_OF_CONDUCT.md +CONTRIBUTING.md +LICENSE.TXT +README.md +SECURITY.md +pyproject.toml + +bolt +clang +clang-tools-extra +cmake +compiler-rt +cross-project-tests +flang +integration-test-suite +libc +libclc +libcxx +libcxxabi +libunwind +lld +lldb +llvm +llvm-libgcc +mlir +offload +openmp +polly +pstl +runtimes +third-party +utils diff --git a/debian/changelog b/debian/changelog index 11449a1e..fe12014e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium + + * Add a .gitignore file with all toplevel upstream files and directories. + + -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 + llvm-toolchain-19 (1:19.1.0~++rc3-1~exp1) experimental; urgency=medium [ Matthias Klose ] From d6a67df2171882f187b8fa4d12495199b55977b3 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 11:56:40 +0200 Subject: [PATCH 135/241] * Add some memory tracking, getting some information on memory hogs. --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- debian/rules | 24 ++- debian/usage-wrapper.py | 394 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 416 insertions(+), 7 deletions(-) create mode 100755 debian/usage-wrapper.py diff --git a/debian/changelog b/debian/changelog index fe12014e..4bc42967 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Add a .gitignore file with all toplevel upstream files and directories. + * Add some memory tracking, getting some information on memory hogs. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control b/debian/control index 216285dd..046d46a3 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, - doxygen, + doxygen, python3:any, python3-psutil, python3-matplotlib, ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], diff --git a/debian/control.in b/debian/control.in index 1635ad33..87bac8fd 100644 --- a/debian/control.in +++ b/debian/control.in @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, - doxygen, + doxygen,@USAGE_BUILD_DEP@ ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], diff --git a/debian/rules b/debian/rules index fd19a3c6..ce9d77ca 100755 --- a/debian/rules +++ b/debian/rules @@ -71,7 +71,7 @@ packages := $(shell dh_listpackages) # flang has some memory hogs, of up to 6.2gb per process. Limit the parallel jobs # based on the available memory ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) - MEM_PER_CPU=4500 + MEM_PER_CPU=6000 else MEM_PER_CPU=2100 endif @@ -79,6 +79,12 @@ NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' / awk -vn=$(NCPUS) -vmt=$$mt -vm=$(MEM_PER_CPU) \ 'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2 $$f2"; \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ + -e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ @@ -873,7 +880,7 @@ stamps/debian-full-build: echo "Using cmake: $(CMAKE_BIN)" # linker hack so stage2 can link against stage1 libs at runtime LD_LIBRARY_PATH=$(STAGE_1_LIB_DIR):$$LD_LIBRARY_PATH \ - VERBOSE=1 $(PRE_PROCESS) $(CMAKE_BIN) --build $(TARGET_BUILD) -j $(NJOBS) --target stage2 || cat build-llvm/tools/clang/stage2-bins/CMakeFiles/CMakeOutput.log + VERBOSE=1 $(TIME_COMMAND) $(PRE_PROCESS) $(CMAKE_BIN) --build $(TARGET_BUILD) -j $(NJOBS) --target stage2 || cat build-llvm/tools/clang/stage2-bins/CMakeFiles/CMakeOutput.log # Check the stage 2 build worked if ! readelf --string-dump .comment $(TARGET_BUILD_STAGE2)/bin/clang 2>&1|grep -q "clang version"; then \ @@ -927,7 +934,7 @@ stamps/debian-libclc-build: -DLLVM_CMAKE_DIR=$(STAGE_2_BIN_DIR)/../ \ $(LIBCLC_LLVM_SPIRV) \ -DLIBCLC_TARGETS_TO_BUILD="$(LIBCLC_TARGETS_TO_BUILD)"; \ - LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(STAGE_2_LIB_DIR) ninja -j $(NJOBS) $(VERBOSE) + LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(STAGE_2_LIB_DIR) $(TIME_COMMAND) ninja -j $(NJOBS) $(VERBOSE) ifndef LLVM_SPIRV echo "libclc built without SPIRV (.spv) outputs because llvm-spirv wasn't found" endif @@ -967,7 +974,7 @@ build-wasm/compiler-rt-%: -DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON \ -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=$(cpu)-unknown-unknown \ -DCOMPILER_RT_OS_DIR=wasi - ninja -C "$@" -j $(NJOBS) $(VERBOSE) + $(TIME_COMMAND) ninja -C "$@" -j $(NJOBS) $(VERBOSE) ifeq ($(LIBCXX_WASM_ENABLE), no) build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-% @@ -1050,7 +1057,7 @@ build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-% -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \ -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \ -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF - ninja -C "$@" -j $(NJOBS) $(VERBOSE) + $(TIME_COMMAND) ninja -C "$@" -j $(NJOBS) $(VERBOSE) endif # Build compiler-rt for wasm32 and wasm64. Build libcxx only for wasm32, as @@ -1452,6 +1459,12 @@ endif # So, we remove this directory from the package rm -fr $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/wasi/ + for svg in usage-*.svg; do \ + [ -f $$svg ] || continue; \ + xz -9v $$svg; \ + cp -p $$svg.xz debian/llvm-$(LLVM_VERSION)/usr/share/doc/llvm-$(LLVM_VERSION)/.; \ + done + stamps/repack_a_llvm_ir: ifeq (${LTO_ENABLE},yes) # with LTO, .a contains llvm ir instead of native code. So, recompile them @@ -1603,5 +1616,6 @@ override_dh_auto_clean: : # remove extra stamps rm -f override_dh_auto_install rm -rf stamps + rm -f usage-*.svg* .PHONY: override_dh_strip preconfigure diff --git a/debian/usage-wrapper.py b/debian/usage-wrapper.py new file mode 100755 index 00000000..ed474e80 --- /dev/null +++ b/debian/usage-wrapper.py @@ -0,0 +1,394 @@ +#!/usr/bin/env python3 + +import argparse +import math +import os +import subprocess +import sys +import threading +import time + +try: + import psutil +except ImportError: + print(f'{sys.argv[0]}: the psutil module is required.', file=sys.stderr) + sys.exit(1) + +try: + import matplotlib.pyplot as plt + from matplotlib.lines import Line2D +except ImportError: + plt = None + + +def to_gigabyte(value): + return value / 1024**3 + + +INTERVAL = 0.33 +LW = 0.5 + +global_n = 0 +global_cpu_data_sum = 0 +global_memory_data_sum = 0 +global_cpu_data_max = 0 +global_memory_data_min = to_gigabyte(psutil.virtual_memory().total) +global_memory_data_max = 0 +global_swap_data_min = to_gigabyte(psutil.swap_memory().total) +global_swap_data_max = 0 +global_disk_data_total = to_gigabyte(psutil.disk_usage('.').total) +global_disk_data_start = to_gigabyte(psutil.disk_usage('.').used) + +global_timestamps = [] +global_cpu_data = [] +global_memory_data = [] +global_process_usage = [] +global_process_hogs = {} + +process_name_map = {} +lock = threading.Lock() + +done = False +start_ts = time.monotonic() +cpu_count = psutil.cpu_count() + +special_processes = {'ld': 'gold', + 'WPA': 'deepskyblue', + 'WPA-stream': 'lightblue', + 'ltrans': 'forestgreen', + 'as': 'coral', + 'GCC': 'gray', + 'clang': 'darkgray', + 'rust': 'brown', + 'go': 'hotpink', + 'dwz': 'limegreen', + 'rpm/dpkg': 'plum'} +for i, k in enumerate(special_processes.keys()): + process_name_map[k] = i + + +descr = 'Run command and measure memory and CPU utilization' +parser = argparse.ArgumentParser(description=descr) +parser.add_argument('command', metavar='command', + help='Command', nargs=argparse.REMAINDER) +parser.add_argument('-c', '--command', dest='command1', + help='command as a single argument') +parser.add_argument('-v', '--verbose', action='store_true', help='Verbose') +parser.add_argument('--summary-only', dest='summary_only', + action='store_true', + help='No plot, just a summary at the end') +parser.add_argument('--base-memory', action='store_true', + help='Adjust memory to include the system load') +parser.add_argument('-s', '--separate-ltrans', action='store_true', + help='Separate LTRANS processes in graph') +parser.add_argument('-o', '--output', default='usage.svg', + help='Path to output image (default: usage.svg)') +parser.add_argument('-r', '--ranges', + help='Plot only the selected time ranges ' + '(e.g. 20-30, 0-1000)') +parser.add_argument('-t', '--title', help='Graph title') +parser.add_argument('-m', '--memory-hog-threshold', type=float, + help='Report about processes that consume the amount of ' + 'memory (in GB)') +parser.add_argument('-f', '--frequency', type=float, + default=INTERVAL, + help='Frequency of measuring (in seconds)') +parser.add_argument('-j', '--jobs', type=int, + default=cpu_count, dest='used_cpus', + help='Scale up CPU data to used CPUs ' + 'instead of available CPUs') +args = parser.parse_args() + +if args.command1 and args.command: + print(f'{sys.argv[0]}: either use -c "", ' + 'or append the command', file=sys.stderr) + sys.exit(1) + +if not args.summary_only and plt is None: + print(f'{sys.argv[0]}: use --summary-only, ' + 'or install the matplotlib module', file=sys.stderr) + sys.exit(1) + +cpu_scale = cpu_count / args.used_cpus + + +def get_process_name(proc): + name = proc.name() + cmdline = proc.cmdline() + if name == 'ld' or name == 'ld.gold': + return 'ld' + elif name == 'lto1-wpa': + return 'WPA' + elif name == 'lto1-wpa-stream': + return 'WPA-stream-out' + elif name in ('cc1', 'cc1plus', 'cc1objc', 'f951', 'd21', 'go1', 'gnat1'): + return 'GCC' + elif name.startswith('clang'): + return 'clang' + elif name.startswith('rust'): + return 'rust' + elif name in ('as', 'dwz', 'go'): + return name + elif name == 'rpmbuild' or name.startswith('dpkg'): + return 'rpm/dpkg' + elif '-fltrans' in cmdline: + if args.separate_ltrans: + return 'ltrans-%d' % proc.pid + else: + return 'ltrans' + return None + + +def record_process_memory_hog(proc, memory, timestamp): + if args.memory_hog_threshold: + if memory >= args.memory_hog_threshold: + cmd = ' '.join(proc.cmdline()) + tpl = (memory, timestamp) + if cmd not in global_process_hogs: + global_process_hogs[cmd] = tpl + elif memory > global_process_hogs[cmd][0]: + global_process_hogs[cmd] = tpl + + +def record(): + global global_n, global_cpu_data_sum, global_cpu_data_max + global global_memory_data_sum, global_memory_data_min + global global_memory_data_max + global global_swap_data_min, global_swap_data_max + + active_pids = {} + while not done: + timestamp = time.monotonic() - start_ts + used_cpu = psutil.cpu_percent(interval=args.frequency) * cpu_scale + used_memory = to_gigabyte(psutil.virtual_memory().used) + used_swap = to_gigabyte(psutil.swap_memory().used) + if not args.summary_only: + global_timestamps.append(timestamp) + global_memory_data.append(used_memory) + global_cpu_data.append(used_cpu) + + global_n += 1 + global_cpu_data_sum += used_cpu + global_memory_data_sum += used_memory + global_cpu_data_max = max(global_cpu_data_max, used_cpu) + global_memory_data_min = min(global_memory_data_min, used_memory) + global_memory_data_max = max(global_memory_data_max, used_memory) + global_swap_data_min = min(global_swap_data_min, used_swap) + global_swap_data_max = max(global_swap_data_max, used_swap) + + entry = {} + seen_pids = set() + for proc in psutil.Process().children(recursive=True): + try: + memory = to_gigabyte(proc.memory_info().rss) + record_process_memory_hog(proc, memory, timestamp) + name = get_process_name(proc) + if name: + seen_pids.add(proc.pid) + if proc.pid not in active_pids: + active_pids[proc.pid] = proc + else: + proc = active_pids[proc.pid] + cpu = proc.cpu_percent() / args.used_cpus + if name not in process_name_map: + length = len(process_name_map) + process_name_map[name] = length + if name not in entry: + entry[name] = {'memory': 0, 'cpu': 0} + entry[name]['cpu'] += cpu + # FIXME: ignore WPA streaming memory - COW makes it bogus + if name != 'WPA-stream-out': + entry[name]['memory'] += memory + except Exception: + # the process can be gone + pass + for pid in list(active_pids.keys()): + if pid not in seen_pids: + del active_pids[pid] + if args.verbose: + print(entry, flush=True) + if not args.summary_only: + global_process_usage.append(entry) + + +def stack_values(process_usage, key): + stacks = [] + for _ in range(len(process_name_map)): + stacks.append([]) + for values in process_usage: + for k, v in process_name_map.items(): + if k in values: + stacks[v].append(values[k][key]) + else: + stacks[v].append(0) + return stacks + + +def get_footnote(): + hostname = os.uname()[1].split('.')[0] + cpu_average = global_cpu_data_sum / global_n + cpu_max = global_cpu_data_max + base_memory = global_memory_data_min + peak_memory = global_memory_data_max + total_mem = to_gigabyte(psutil.virtual_memory().total) + return (f'host: {hostname}; CPUs: {args.used_cpus}/{cpu_count};' + f' CPU avg: {cpu_average:.0f}%;' + f' CPU max: {cpu_max:.0f}%;' + f' base memory: {base_memory:.1f} GB;' + f' peak memory: {peak_memory:.1f} GB;' + f' total memory: {total_mem:.1f} GB') + + +def get_footnote2(): + peak_swap = global_swap_data_max + total_swap = to_gigabyte(psutil.swap_memory().total) + disk_total = global_disk_data_total + disk_start = global_disk_data_start + disk_end = to_gigabyte(psutil.disk_usage('.').used) + disk_delta = disk_end - disk_start + return (f'swap peak/total: {peak_swap:.1f}/{total_swap:.1f} GB;' + f' disk start/end/total: {disk_start:.1f}/{disk_end:.1f}/{disk_total:.1f} GB;' + f' disk delta: {disk_delta:.1f} GB') + + +def generate_graph(time_range): + timestamps = [] + cpu_data = [] + memory_data = [] + process_usage = [] + + # filter date by timestamp + for i, ts in enumerate(global_timestamps): + if not time_range or time_range[0] <= ts and ts <= time_range[1]: + timestamps.append(ts) + cpu_data.append(global_cpu_data[i]) + memory_data.append(global_memory_data[i]) + process_usage.append(global_process_usage[i]) + + if not timestamps: + if args.verbose: + print('No data for range: %s' % str(time_range)) + return + + peak_memory = max(memory_data) + + fig, (cpu_subplot, mem_subplot) = plt.subplots(2, sharex=True) + title = args.title if args.title else '' + if time_range: + title += ' (%d-%d s)' % (time_range[0], time_range[1]) + fig.suptitle(title, fontsize=17) + fig.set_figheight(5) + fig.set_figwidth(10) + # scale cpu axis + local_peak_cpu = max(cpu_data) + cpu_ylimit = (local_peak_cpu // 10) * 11 + 5 + if cpu_ylimit > 200: + cpu_ylimit = 200 + cpu_subplot.set_title('CPU usage') + cpu_subplot.set_ylabel('%') + cpu_subplot.plot(timestamps, cpu_data, c='blue', lw=LW, label='total') + cpu_subplot.set_ylim([0, cpu_ylimit]) + cpu_subplot.axhline(color='r', alpha=0.5, y=100.0 / args.used_cpus, lw=LW, + linestyle='dotted', label='single core') + cpu_subplot.set_xlim(left=time_range[0] if time_range else 0) + cpu_subplot.grid(True) + + mem_subplot.plot(timestamps, memory_data, c='blue', lw=LW, label='total') + mem_subplot.set_title('Memory usage') + mem_subplot.set_ylabel('GB') + mem_subplot.set_xlabel('time') + + # scale it to a reasonable limit + limit = 1 + while peak_memory > limit: + limit *= 2 + if limit > 2 and limit * 0.75 >= peak_memory: + limit = int(limit * 0.75) + mem_subplot.set_ylim([0, 1.1 * limit]) + mem_subplot.set_yticks(range(0, limit + 1, math.ceil(limit / 8))) + mem_subplot.grid(True) + + colors = list(plt.cm.get_cmap('tab20c').colors * 100) + for name, color in special_processes.items(): + if name in process_name_map: + colors[process_name_map[name]] = color + + mem_stacks = stack_values(process_usage, 'memory') + cpu_stacks = stack_values(process_usage, 'cpu') + if mem_stacks: + mem_subplot.stackplot(timestamps, mem_stacks, + colors=colors) + cpu_subplot.stackplot(timestamps, cpu_stacks, + colors=colors) + + # generate custom legend + colors = special_processes.values() + custom_lines = [Line2D([0], [0], color=x, lw=5) for x in colors] + custom_lines.insert(0, Line2D([0], [0], color='b', lw=LW)) + custom_lines.insert(0, Line2D([0], [0], color='r', alpha=0.5, + linestyle='dotted', lw=LW)) + names = ['single core', 'total'] + list(special_processes.keys()) + fig.legend(custom_lines, names, loc='right', prop={'size': 6}) + + filename = args.output + if time_range: + tr = '-%d-%d' % (time_range[0], time_range[1]) + filename = os.path.splitext(args.output)[0] + tr + '.svg' + plt.subplots_adjust(bottom=0.15) + plt.figtext(0.1, 0.04, get_footnote(), fontsize='small') + plt.figtext(0.1, 0.01, get_footnote2(), fontsize='small') + plt.savefig(filename) + if args.verbose: + print('Saving plot to %s' % filename) + + +def summary(): + print(f'SUMMARY: {get_footnote()}') + print(f'SUMMARY: {get_footnote2()}') + if global_process_hogs: + print(f'PROCESS MEMORY HOGS (>={args.memory_hog_threshold:.1f} GB):') + items = sorted(global_process_hogs.items(), key=lambda x: x[1][0], + reverse=True) + for cmdline, (memory, ts) in items: + print(f' {memory:.1f} GB: {ts:.1f} s: {cmdline}') + + +thread = threading.Thread(target=record, args=()) +thread.start() + +ranges = [] +if args.ranges: + for r in args.ranges.split(','): + parts = r.split('-') + assert len(parts) == 2 + ranges.append([int(x) for x in parts]) + +if args.verbose: + print('Ranges are %s' % str(ranges)) + print('Running command', flush=True) + +cp = None +try: + if args.command1: + cp = subprocess.run(args.command1, shell=True) + else: + cp = subprocess.run(args.command) +except KeyboardInterrupt: + rv = 2 +finally: + done = True + thread.join() + summary() + if global_memory_data: + min_memory = min(global_memory_data) + if not args.base_memory: + global_memory_data = [x - min_memory for x in global_memory_data] + + if plt: + generate_graph(None) + for r in ranges: + generate_graph(r) + if cp: + rv = cp.returncode + +sys.exit(rv) From 1fc85c3142bfada26b49e439848e182f5835b241 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 12:13:37 +0200 Subject: [PATCH 136/241] * Don't require g++-multilib on s390x for newer Ubuntu releases. --- debian/changelog | 1 + debian/control.in | 2 +- debian/rules | 17 ++++++++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4bc42967..472caae3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Add a .gitignore file with all toplevel upstream files and directories. * Add some memory tracking, getting some information on memory hogs. + * Don't require g++-multilib on s390x for newer Ubuntu releases. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control.in b/debian/control.in index 87bac8fd..8b7ecf75 100644 --- a/debian/control.in +++ b/debian/control.in @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libipt-dev [amd64 i386], lcov, procps, help2man, zlib1g-dev, libzstd-dev, - g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], + g++-multilib [@MULTILIB_ARCHS@], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen,@USAGE_BUILD_DEP@ ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], diff --git a/debian/rules b/debian/rules index ce9d77ca..429204ff 100755 --- a/debian/rules +++ b/debian/rules @@ -53,6 +53,9 @@ endif VENDOR=$(shell lsb_release -is) DISTRO=$(shell lsb_release -sc) +DERIVATIVE := $(shell if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; \ + elif dpkg-vendor --derives-from Debian; then echo Debian; \ + else echo Unknown; fi) SONAME_EXT := 1 SONAME_OPENMP := 5 @@ -89,6 +92,13 @@ DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') include /usr/share/dpkg/architecture.mk +MULTILIB_ARCHS := amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +ifeq ($(DERIVATIVE),Ubuntu) + ifeq (,$(filter $(DISTRO), bionic focal jammy noble)) + MULTILIB_ARCHS := $(filter-out s390 s390x, $(MULTILIB_ARCHS)) + endif +endif + CONFIGURE_EXTRA = # these are handled on a per stage / build basis @@ -166,7 +176,7 @@ endif Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=OFF ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0) # no ocaml support in main for Ubuntu -ifneq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) +ifeq ($(DERIVATIVE),Debian) Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON endif endif @@ -174,7 +184,7 @@ STAGE_2_CMAKE_EXTRA += $(Z3_FLAG) # Change the default CPU for s390x ZARCH=z196 -ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) +ifeq ($(DERIVATIVE),Ubuntu) ZARCH=z13 endif STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH) @@ -404,7 +414,7 @@ RUN_TEST=yes ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) RUN_TEST=no endif -ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) +ifeq ($(DERIVATIVE),Ubuntu) ifeq (riscv64,$(DEB_HOST_ARCH)) RUN_TEST=no endif @@ -653,6 +663,7 @@ stamps/preconfigure: echo "$$f => $$f2"; \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ -e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \ + -e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ From df85a63901037b237e273c03920b62b0ead01f66 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 12:20:00 +0200 Subject: [PATCH 137/241] * Factor-out ocaml architectures. --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 10 +++++----- debian/rules | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 472caae3..cc020d44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Add a .gitignore file with all toplevel upstream files and directories. * Add some memory tracking, getting some information on memory hogs. * Don't require g++-multilib on s390x for newer Ubuntu releases. + * Factor-out ocaml architectures. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control b/debian/control index 046d46a3..45a29154 100644 --- a/debian/control +++ b/debian/control @@ -458,7 +458,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-19-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el s390x riscv64 +Architecture: amd64 arm64 armhf ppc64el riscv64 s390x Suggests: llvm-19-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-19-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/control.in b/debian/control.in index 8b7ecf75..bb21dcb8 100644 --- a/debian/control.in +++ b/debian/control.in @@ -19,10 +19,10 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, g++-multilib [@MULTILIB_ARCHS@], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen,@USAGE_BUILD_DEP@ - ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], - ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], - libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], - dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], + ocaml-base [@OCAML_ARCHS@] | ocaml-nox [@OCAML_ARCHS@], + ocaml-findlib [@OCAML_ARCHS@], + libctypes-ocaml-dev [@OCAML_ARCHS@], + dh-exec, dh-ocaml [@OCAML_ARCHS@], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise @@ -458,7 +458,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-@LLVM_VERSION@-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el s390x riscv64 +Architecture: @OCAML_ARCHS@ Suggests: llvm-@LLVM_VERSION@-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-@LLVM_VERSION@-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/rules b/debian/rules index 429204ff..a169fa69 100755 --- a/debian/rules +++ b/debian/rules @@ -664,6 +664,7 @@ stamps/preconfigure: sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ -e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \ -e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \ + -e "s|@OCAML_ARCHS@|$(OCAML_ARCHS)|g" \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ From b4a5aa6e85264f86f0721480cb28dcddddae6951 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 12:22:32 +0200 Subject: [PATCH 138/241] * Don't try to install xray and profile headers on armel and armhf. --- debian/changelog | 1 + debian/libclang-common-X.Y-dev.install.in | 6 ++++-- debian/rules | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc020d44..4fab4b80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Add some memory tracking, getting some information on memory hogs. * Don't require g++-multilib on s390x for newer Ubuntu releases. * Factor-out ocaml architectures. + * Don't try to install xray and profile headers on armel and armhf. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 43abdb24..638e7172 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -1,7 +1,9 @@ +#!/usr/bin/dh-exec + usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap -usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ -usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/ +[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ +[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/ diff --git a/debian/rules b/debian/rules index a169fa69..dcbe4728 100755 --- a/debian/rules +++ b/debian/rules @@ -678,6 +678,7 @@ stamps/preconfigure: chmod +x \ debian/clang-tools-$(LLVM_VERSION).install \ debian/libclang-$(LLVM_VERSION)-dev.install \ + debian/libclang-common-$(LLVM_VERSION)-dev.install \ debian/libclang-rt-$(LLVM_VERSION)-dev.install \ debian/libpolly-$(LLVM_VERSION)-dev.install \ debian/libomp-$(LLVM_VERSION)-dev.install \ From f804b23c23cd60b3c2ad1e5897f57950ffe7c5ef Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 12:25:24 +0200 Subject: [PATCH 139/241] * Disable ocaml on armhf, requires ocamlopt. --- debian/changelog | 1 + debian/control | 10 +++++----- debian/rules | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4fab4b80..2cf6f3fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Don't require g++-multilib on s390x for newer Ubuntu releases. * Factor-out ocaml architectures. * Don't try to install xray and profile headers on armel and armhf. + * Disable ocaml on armhf, requires ocamlopt. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control b/debian/control index 45a29154..83eb64b3 100644 --- a/debian/control +++ b/debian/control @@ -19,10 +19,10 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen, python3:any, python3-psutil, python3-matplotlib, - ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], - ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], - libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], - dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], + ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], + ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], + libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], + dh-exec, dh-ocaml [amd64 arm64 ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise @@ -458,7 +458,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-19-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el riscv64 s390x +Architecture: amd64 arm64 ppc64el riscv64 s390x Suggests: llvm-19-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-19-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/rules b/debian/rules index dcbe4728..c8eeda69 100755 --- a/debian/rules +++ b/debian/rules @@ -539,7 +539,7 @@ endif DH_OPTIONS= OCAML_ENABLE= no -OCAML_ARCHS := amd64 arm64 armhf ppc64el riscv64 s390x +OCAML_ARCHS := amd64 arm64 ppc64el riscv64 s390x ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS))) # Enable OCAML for this arch. OCAML_ENABLE=yes From 9b503ea56abd3031ac9b3b2feafe8503f7d343b7 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 12:37:19 +0200 Subject: [PATCH 140/241] * Factor-out omp architectures. --- debian/changelog | 1 + debian/control | 4 ++-- debian/control.in | 4 ++-- debian/rules | 4 +++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2cf6f3fa..7e345739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Factor-out ocaml architectures. * Don't try to install xray and profile headers on armel and armhf. * Disable ocaml on armhf, requires ocamlopt. + * Factor-out omp architectures. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control b/debian/control index 83eb64b3..7f151a85 100644 --- a/debian/control +++ b/debian/control @@ -623,7 +623,7 @@ Description: Next generation, high-performance debugger, header files Package: libomp-19-dev Section: libdevel -Architecture: amd64 arm64 armhf loong64 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf loong64 mips64el ppc64 ppc64el riscv64 Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-19-doc Breaks: libiomp-dev (<< 3.7-1) @@ -637,7 +637,7 @@ Description: LLVM OpenMP runtime - dev package Package: libomp5-19 Multi-Arch: same -Architecture: amd64 arm64 armhf loong64 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf loong64 mips64el ppc64 ppc64el riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y diff --git a/debian/control.in b/debian/control.in index bb21dcb8..82264a99 100644 --- a/debian/control.in +++ b/debian/control.in @@ -623,7 +623,7 @@ Description: Next generation, high-performance debugger, header files Package: libomp-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armhf loong64 mips64el ppc64el ppc64 riscv64 +Architecture: @OMP_ARCHS@ Depends: libomp5-@LLVM_VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-@LLVM_VERSION@-doc Breaks: libiomp-dev (<< 3.7-1) @@ -637,7 +637,7 @@ Description: LLVM OpenMP runtime - dev package Package: libomp5-@LLVM_VERSION@ Multi-Arch: same -Architecture: amd64 arm64 armhf loong64 mips64el ppc64el ppc64 riscv64 +Architecture: @OMP_ARCHS@ Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y diff --git a/debian/rules b/debian/rules index c8eeda69..a8bc11ba 100755 --- a/debian/rules +++ b/debian/rules @@ -395,8 +395,9 @@ else endif # Enable openmp (or not) +OMP_ARCHS = amd64 arm64 armhf loong64 mips64el ppc64 ppc64el riscv64 OPENMP_ENABLE=yes -ifneq (,$(filter $(DEB_HOST_ARCH), i386 m68k mipsel powerpc powerpcspe sparc64 s390x x32)) +ifeq (,$(filter $(DEB_HOST_ARCH), $(OMP_ARCHS))) OPENMP_ENABLE=no else RUNTIMES += ;openmp;offload @@ -665,6 +666,7 @@ stamps/preconfigure: -e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \ -e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \ -e "s|@OCAML_ARCHS@|$(OCAML_ARCHS)|g" \ + -e "s|@OMP_ARCHS@|$(OMP_ARCHS)|g" \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ From b31ea1725b7152cf45090345949aad0e1bdcdc00 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 12:39:19 +0200 Subject: [PATCH 141/241] * Disable openmp on riscv64 (ld: cannot find -lomptarget.rtl.host). --- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e345739..98d05a0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Don't try to install xray and profile headers on armel and armhf. * Disable ocaml on armhf, requires ocamlopt. * Factor-out omp architectures. + * Disable openmp on riscv64 (ld: cannot find -lomptarget.rtl.host). -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control b/debian/control index 7f151a85..2a560b46 100644 --- a/debian/control +++ b/debian/control @@ -623,7 +623,7 @@ Description: Next generation, high-performance debugger, header files Package: libomp-19-dev Section: libdevel -Architecture: amd64 arm64 armhf loong64 mips64el ppc64 ppc64el riscv64 +Architecture: amd64 arm64 armhf loong64 mips64el ppc64 ppc64el Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-19-doc Breaks: libiomp-dev (<< 3.7-1) @@ -637,7 +637,7 @@ Description: LLVM OpenMP runtime - dev package Package: libomp5-19 Multi-Arch: same -Architecture: amd64 arm64 armhf loong64 mips64el ppc64 ppc64el riscv64 +Architecture: amd64 arm64 armhf loong64 mips64el ppc64 ppc64el Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y diff --git a/debian/rules b/debian/rules index a8bc11ba..b47a6d72 100755 --- a/debian/rules +++ b/debian/rules @@ -395,7 +395,7 @@ else endif # Enable openmp (or not) -OMP_ARCHS = amd64 arm64 armhf loong64 mips64el ppc64 ppc64el riscv64 +OMP_ARCHS = amd64 arm64 armhf loong64 mips64el ppc64 ppc64el OPENMP_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH), $(OMP_ARCHS))) OPENMP_ENABLE=no From 6c740871b8998117d0ecdaba65270e139ce2bbb8 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 13:13:12 +0200 Subject: [PATCH 142/241] * Factor-out flang architectures. --- debian/changelog | 1 + debian/control.in | 4 ++-- debian/rules | 15 +++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 98d05a0d..e6600812 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Disable ocaml on armhf, requires ocamlopt. * Factor-out omp architectures. * Disable openmp on riscv64 (ld: cannot find -lomptarget.rtl.host). + * Factor-out flang architectures. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control.in b/debian/control.in index 82264a99..8812df58 100644 --- a/debian/control.in +++ b/debian/control.in @@ -933,7 +933,7 @@ Description: Post-link optimizer Package: flang-@LLVM_VERSION@ # no 32bit support # https://github.com/llvm/llvm-project/issues/59845 -Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 +Architecture: @FLANG_ARCHS@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-@LLVM_VERSION@-dev (= ${binary:Version}), Provides: fortran-compiler, gfortran-mod-15 Description: Fortran compiler @@ -944,7 +944,7 @@ Description: Fortran compiler of examples, some functionalities are still missing. Package: libflang-@LLVM_VERSION@-dev -Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 +Architecture: @FLANG_ARCHS@ Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Description: Flang library - Development package diff --git a/debian/rules b/debian/rules index b47a6d72..75620152 100755 --- a/debian/rules +++ b/debian/rules @@ -71,9 +71,12 @@ endif # this always includes the binary-indep packages. packages := $(shell dh_listpackages) +# no 32bit support +FLANG_ARCHS := amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 + # flang has some memory hogs, of up to 6.2gb per process. Limit the parallel jobs # based on the available memory -ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) +ifneq (,$(filter $(DEB_HOST_ARCH), $(FLANG_ARCHS))) MEM_PER_CPU=6000 else MEM_PER_CPU=2100 @@ -85,7 +88,11 @@ NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' / TIME_COMMAND = /bin/time -v TIME_COMMAND = $(CURDIR)/debian/usage-wrapper.py -j $(NJOBS) --base-memory -m 4.0 -o usage-$(notdir $@)-$(DEB_HOST_ARCH).svg ifneq (,$(findstring usage-wrapper, $(TIME_COMMAND))) - USAGE_BUILD_DEP = $(EMPTY) python3:any, python3-psutil, python3-matplotlib, + ifeq ($(DERIVATIVE),Ubuntu) + USAGE_BUILD_DEP = $(EMPTY) python3:any, python3-psutil, python3-matplotlib [!i386], + else + USAGE_BUILD_DEP = $(EMPTY) python3:any, python3-psutil, python3-matplotlib, + endif endif DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') @@ -355,8 +362,7 @@ ifneq (,$(filter libllvmlibc-$(LLVM_VERSION)-dev, $(packages))) endif endif -# flang is only for 64bits -ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) +ifneq (,$(filter $(DEB_HOST_ARCH), $(FLANG_ARCHS))) PROJECTS += ;flang endif @@ -667,6 +673,7 @@ stamps/preconfigure: -e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \ -e "s|@OCAML_ARCHS@|$(OCAML_ARCHS)|g" \ -e "s|@OMP_ARCHS@|$(OMP_ARCHS)|g" \ + -e "s|@FLANG_ARCHS@|$(FLANG_ARCHS)|g" \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ From 610c0b7b3a5ad327fe1c173660a66e9394d3f94d Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 13:14:09 +0200 Subject: [PATCH 143/241] * Disable flang on mips64el (currently not supported). --- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6600812..625535fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Factor-out omp architectures. * Disable openmp on riscv64 (ld: cannot find -lomptarget.rtl.host). * Factor-out flang architectures. + * Disable flang on mips64el (currently not supported). -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control b/debian/control index 2a560b46..05025ad8 100644 --- a/debian/control +++ b/debian/control @@ -933,7 +933,7 @@ Description: Post-link optimizer Package: flang-19 # no 32bit support # https://github.com/llvm/llvm-project/issues/59845 -Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 +Architecture: amd64 arm64 ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-19-dev (= ${binary:Version}), Provides: fortran-compiler, gfortran-mod-15 Description: Fortran compiler @@ -944,7 +944,7 @@ Description: Fortran compiler of examples, some functionalities are still missing. Package: libflang-19-dev -Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 +Architecture: amd64 arm64 ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Description: Flang library - Development package diff --git a/debian/rules b/debian/rules index 75620152..8840f1ec 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ endif packages := $(shell dh_listpackages) # no 32bit support -FLANG_ARCHS := amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 +FLANG_ARCHS := amd64 arm64 ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 # flang has some memory hogs, of up to 6.2gb per process. Limit the parallel jobs # based on the available memory From 1a852fe062b7f2e0f8fdc5dc90dd65ebf7b71754 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 13:18:41 +0200 Subject: [PATCH 144/241] * Don't try to install hwasan_symbolize on x32. * Don't try to install xray and profile headers on x32. --- debian/changelog | 2 ++ debian/clang-tools-X.Y.install.in | 2 +- debian/libclang-common-X.Y-dev.install.in | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 625535fd..2be6d812 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Disable openmp on riscv64 (ld: cannot find -lomptarget.rtl.host). * Factor-out flang architectures. * Disable flang on mips64el (currently not supported). + * Don't try to install hwasan_symbolize on x32. + * Don't try to install xray and profile headers on x32. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index dbde4de9..744f7a73 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -64,7 +64,7 @@ usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++ usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / HWASAN_SUPPORTED_ARCH -[amd64 arm64 riscv64 i386 x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize +[amd64 arm64 riscv64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 638e7172..571a6619 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -2,8 +2,8 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap -[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ -[!armel !armhf] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/ +[!armel !armhf !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ +[!armel !armhf !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/ From 12e4ddd238e2f8e1b6e04dea10fb18ebb944852c Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 14:44:49 +0200 Subject: [PATCH 145/241] fix usage-wrapper for Ubuntu/i386 --- debian/rules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8840f1ec..47de56c6 100755 --- a/debian/rules +++ b/debian/rules @@ -86,10 +86,13 @@ NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' / 'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2 Date: Fri, 30 Aug 2024 10:18:49 +0200 Subject: [PATCH 146/241] update .gitignore with build artifacts --- .gitignore | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/.gitignore b/.gitignore index f371bbfd..3bcab131 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,79 @@ pstl runtimes third-party utils + +build-wasm +stamps +usage-*.svg* + +debian/*.debhelper.log +debian/*.dirs +debian/*.docs +debian/*.examples +debian/*.install +debian/*.links +debian/*.lintian-overrides +debian/*.manpages +debian/*.substvars +debian/.debhelper +debian/man +debian/tmp +debian/usr + +debian/pollycc + +debian/bolt-19 +debian/clang-19-doc +debian/clang-19-examples +debian/clang-19 +debian/clang-format-19 +debian/clang-tidy-19 +debian/clang-tools-19 +debian/clangd-19 +debian/flang-19 +debian/libbolt-19-dev +debian/libc++-19-dev-wasm32 +debian/libc++-19-dev +debian/libc++1-19 +debian/libc++abi-19-dev-wasm32 +debian/libc++abi-19-dev +debian/libc++abi1-19 +debian/libclang-19-dev +debian/libclang-common-19-dev +debian/libclang-cpp19-dev +debian/libclang-cpp19 +debian/libclang-rt-19-dev-wasm32 +debian/libclang-rt-19-dev-wasm64 +debian/libclang-rt-19-dev +debian/libclang1-19 +debian/libclc-19-dev +debian/libclc-19 +debian/libflang-19-dev +debian/libfuzzer-19-dev +debian/liblld-19-dev +debian/liblld-19 +debian/liblldb-19-dev +debian/liblldb-19 +debian/libllvm-19-ocaml-dev +debian/libllvm19 +debian/libllvmlibc-19-dev +debian/libmlir-19-dev +debian/libmlir-19 +debian/libomp-19-dev +debian/libomp-19-doc +debian/libomp5-19 +debian/libpolly-19-dev +debian/libunwind-19-dev +debian/libunwind-19 +debian/lld-19 +debian/lldb-19 +debian/llvm-19-dev +debian/llvm-19-doc +debian/llvm-19-examples +debian/llvm-19-linker-tools +debian/llvm-19-runtime +debian/llvm-19-tools +debian/llvm-19 +debian/mlir-19-tools +debian/python3-clang-19 +debian/python3-lldb-19 From fd46c750c481fa8964b72d2349a689bc892fd6da Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 30 Aug 2024 10:39:49 +0200 Subject: [PATCH 147/241] * Fix installation of the shared libllvm and libclang-cpp libraries under their soname. Closes: #1072200. * Drop some of the unnecessary libllvm symlinks. --- debian/changelog | 5 ++++- debian/control | 2 ++ debian/control.in | 2 ++ debian/libclang-cppX.Y.install.in | 3 +-- debian/libclang-cppX.Y.links.in | 3 ++- debian/libclang1-X.Y.links.in | 6 +++--- debian/libllvmX.Y.install.in | 8 ++++++-- debian/libllvmX.Y.links.in | 10 +++++++--- debian/llvm-X.Y-dev.links.in | 6 ------ debian/rules | 12 ++++++++++++ 10 files changed, 39 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2be6d812..bb452986 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,11 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Disable flang on mips64el (currently not supported). * Don't try to install hwasan_symbolize on x32. * Don't try to install xray and profile headers on x32. + * Fix installation of the shared libllvm and libclang-cpp libraries + under their soname. Closes: #1072200. + * Drop some of the unnecessary libllvm symlinks. - -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 + -- Matthias Klose Fri, 30 Aug 2024 10:38:09 +0200 llvm-toolchain-19 (1:19.1.0~++rc3-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 05025ad8..520b55b6 100644 --- a/debian/control +++ b/debian/control @@ -347,6 +347,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same +Breaks: llvm19-dev (<< 1:19.1.0~++rc3-1~exp2) +Replaces: llvm19-dev (<< 1:19.1.0~++rc3-1~exp2) Description: Modular compiler and toolchain technologies, runtime library LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other diff --git a/debian/control.in b/debian/control.in index 8812df58..a78e1ba8 100644 --- a/debian/control.in +++ b/debian/control.in @@ -347,6 +347,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same +Breaks: llvm@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) +Replaces: llvm@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) Description: Modular compiler and toolchain technologies, runtime library LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Y.install.in index 607ccaa2..25c30797 100644 --- a/debian/libclang-cppX.Y.install.in +++ b/debian/libclang-cppX.Y.install.in @@ -1,2 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ - +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Y.links.in index ee382f6d..5d0e8f2a 100644 --- a/debian/libclang-cppX.Y.links.in +++ b/debian/libclang-cppX.Y.links.in @@ -1 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@ +# symlink from the LLVM libdir to the system libdir +usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.1 diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in index 3ec0d6ac..28fa2812 100644 --- a/debian/libclang1-X.Y.links.in +++ b/debian/libclang1-X.Y.links.in @@ -1,6 +1,6 @@ # as upstream -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 + +# FIXME: these are not installed by upstream, there are only libclang-19.so.19, libclang-19.1.0.so, libclang-19.so and libclang.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index ce46f373..7100f0b6 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1,3 +1,7 @@ +# install everything in /usr/lib/@DEB_HOST_MULTIARCH@/ + +# this is libLLVM.so.1, renamed to it's soname in the override_dh_install target +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ /usr/lib/@DEB_HOST_MULTIARCH@/ + +# this is a symlink installed by upstream usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 067b0884..2c3e5bbd 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,4 +1,8 @@ -# Should be uncommented for @LLVM_VERSION@.1 and other -# usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so +# provide symlinks in the LLVM subdir +# symlink to the soname in the llvm libdir +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ + +# FIXME: why is this one needed? This already is in the llvm-dev package in the llvm libdir +# create symlink to the symlink installed by upstream +#usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index b3a2a2ae..b6e0cfd7 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -1,9 +1,3 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 - usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/include/llvm-c usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/include/llvm usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/build/include/llvm-c diff --git a/debian/rules b/debian/rules index 47de56c6..0279941c 100755 --- a/debian/rules +++ b/debian/rules @@ -1457,6 +1457,18 @@ else endif override_dh_install: + : # fix libLLVM.so.1 install, install it under the SONAME + -ls -l debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM*.so* + test -f debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM.so.1 + + if [ -f debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM.so.1 ] && [ ! -h debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM.so.1 ]; then \ + soname=$$(objdump -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM.so.1 | awk '/ *SONAME / {print $$2}'); \ + rm -f debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/$$soname; \ + mv debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM.so.1 debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/$$soname; \ + ln -sf $$soname debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so; \ + ln -sf $$soname debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM.so; \ + fi + ifeq (${POLLY_ENABLE},yes) # only for arch:any builds ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(packages))) From d4d85145125f695b5e078c6f50469442aea4ddbc Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 30 Aug 2024 14:15:20 +0200 Subject: [PATCH 148/241] * debian/orig-tar.sh: Don't include .git/.github metadata. --- debian/changelog | 3 ++- debian/orig-tar.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb452986..07aec591 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2ubuntu6) oracular; urgency=medium * Add a .gitignore file with all toplevel upstream files and directories. * Add some memory tracking, getting some information on memory hogs. @@ -15,6 +15,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Fix installation of the shared libllvm and libclang-cpp libraries under their soname. Closes: #1072200. * Drop some of the unnecessary libllvm symlinks. + * debian/orig-tar.sh: Don't include .git/.github metadata. -- Matthias Klose Fri, 30 Aug 2024 10:38:09 +0200 diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 3b98f53c..efd20edf 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -165,7 +165,7 @@ cp -R llvm-toolchain-integration-test-suite llvm-project/integration-test-suite # Argument to compress faster (for the cost of time) export XZ_OPT="-4 -T$(nproc)" echo "Compressing to $FILENAME" -time tar Jcf $CURRENT_PATH/"$FILENAME" --exclude .git --exclude build-llvm --transform="s|llvm-project|$BASE|" -C $EXPORT_PATH llvm-project +time tar Jcf $CURRENT_PATH/"$FILENAME" --exclude .git --exclude .gitattributes --exclude .git-blame-ignore-revs --exclude .gitignore --exclude .github --exclude build-llvm --transform="s|llvm-project|$BASE|" -C $EXPORT_PATH llvm-project rm -rf llvm-project/integration-test-suite export DEBFULLNAME="Sylvestre Ledru" From 015428de7e0b6d75b1aae8363a0e08e0265159b0 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 30 Aug 2024 14:38:09 +0200 Subject: [PATCH 149/241] more .gitignore updates --- .gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitignore b/.gitignore index 3bcab131..0be6592e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ .github .mailmap +# upstream toplevel files CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE.TXT @@ -14,6 +15,7 @@ README.md SECURITY.md pyproject.toml +# upstream directories bolt clang clang-tools-extra @@ -40,10 +42,13 @@ runtimes third-party utils +# build files +build-llvm build-wasm stamps usage-*.svg* +# generated debian files debian/*.debhelper.log debian/*.dirs debian/*.docs @@ -54,12 +59,22 @@ debian/*.lintian-overrides debian/*.manpages debian/*.substvars debian/.debhelper + debian/man debian/tmp debian/usr +debian/libclang1-19.symbols +debian/libllvm-19-ocaml-dev.META +debian/libomp5-19.symbols +debian/lldb-19.postinst +debian/llvm-19-runtime.binfmt +debian/llvm-19-runtime.binfmt.conf +debian/llvm-19-runtime.postinst +debian/llvm-19-runtime.prerm debian/pollycc +# package directories debian/bolt-19 debian/clang-19-doc debian/clang-19-examples From 1576800889a560fd96c9eca31f2e5993cb20e495 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 30 Aug 2024 19:11:55 +0200 Subject: [PATCH 150/241] * debian/rules. Call again dh_ocaml. Closes: #1078234. --- debian/changelog | 5 +++-- debian/rules | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07aec591..e3f6631c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2ubuntu6) oracular; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Add a .gitignore file with all toplevel upstream files and directories. * Add some memory tracking, getting some information on memory hogs. @@ -16,8 +16,9 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2ubuntu6) oracular; urgency=medium under their soname. Closes: #1072200. * Drop some of the unnecessary libllvm symlinks. * debian/orig-tar.sh: Don't include .git/.github metadata. + * debian/rules. Call again dh_ocaml. Closes: #1078234. - -- Matthias Klose Fri, 30 Aug 2024 10:38:09 +0200 + -- Matthias Klose Fri, 30 Aug 2024 19:10:21 +0200 llvm-toolchain-19 (1:19.1.0~++rc3-1~exp1) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index 0279941c..6c9c6113 100755 --- a/debian/rules +++ b/debian/rules @@ -745,7 +745,6 @@ stamps/preconfigure: # Override this two targets. They are trying to manage the .in conversion for me override_dh_ocamlinit: override_dh_ocamlclean: -override_dh_ocaml: override_dh_auto_configure: stamps/configure stamps/configure: stamps/preconfigure From d82f387e925c698890927db8b372e76dc04a6548 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 30 Aug 2024 19:31:20 +0200 Subject: [PATCH 151/241] * debian/rules: Don't create a stamp for the override_dh_auto_install target. --- debian/changelog | 1 + debian/rules | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e3f6631c..99d49b1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Drop some of the unnecessary libllvm symlinks. * debian/orig-tar.sh: Don't include .git/.github metadata. * debian/rules. Call again dh_ocaml. Closes: #1078234. + * debian/rules: Don't create a stamp for the override_dh_auto_install target. -- Matthias Klose Fri, 30 Aug 2024 19:10:21 +0200 diff --git a/debian/rules b/debian/rules index 6c9c6113..71c67ac3 100755 --- a/debian/rules +++ b/debian/rules @@ -1395,8 +1395,6 @@ endif # Delete the target build directory to save some space on the build systems # All the files have been installed in $(CURDIR)/debian/tmp/ already rm -rf $(TARGET_BUILD) -# FIXME: why a stamp for dh_override_install ? - touch $@ override_dh_makeshlibs: From 368a3f707072c81444428b956cf3b7368afac511 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 30 Aug 2024 19:31:37 +0200 Subject: [PATCH 152/241] more .gitignore updates --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 0be6592e..eec52a15 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,8 @@ debian/*.examples debian/*.install debian/*.links debian/*.lintian-overrides +debian/*.oinfo.debhelper +debian/*.olist.debhelper debian/*.manpages debian/*.substvars debian/.debhelper From 0e2f1f91c5f85bfb74ce5e527b258814765cec1c Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 30 Aug 2024 19:36:39 +0200 Subject: [PATCH 153/241] prepare for upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 99d49b1a..953ccde4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc3-1) unstable; urgency=medium * Add a .gitignore file with all toplevel upstream files and directories. * Add some memory tracking, getting some information on memory hogs. @@ -19,7 +19,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * debian/rules. Call again dh_ocaml. Closes: #1078234. * debian/rules: Don't create a stamp for the override_dh_auto_install target. - -- Matthias Klose Fri, 30 Aug 2024 19:10:21 +0200 + -- Matthias Klose Fri, 30 Aug 2024 19:32:59 +0200 llvm-toolchain-19 (1:19.1.0~++rc3-1~exp1) experimental; urgency=medium From b0a85f65cc1a1f83343a71393fb66640f88d8a6d Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 31 Aug 2024 07:42:38 +0200 Subject: [PATCH 154/241] * Fix binary-indep build. --- debian/changelog | 6 ++++++ debian/rules | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 953ccde4..2fa2b11f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.0~++rc3-2) UNRELEASED; urgency=medium + + * Fix binary-indep build. + + -- Matthias Klose Sat, 31 Aug 2024 07:41:44 +0200 + llvm-toolchain-19 (1:19.1.0~++rc3-1) unstable; urgency=medium * Add a .gitignore file with all toplevel upstream files and directories. diff --git a/debian/rules b/debian/rules index 71c67ac3..8bf885c9 100755 --- a/debian/rules +++ b/debian/rules @@ -1493,11 +1493,13 @@ endif # So, we remove this directory from the package rm -fr $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/wasi/ - for svg in usage-*.svg; do \ - [ -f $$svg ] || continue; \ - xz -9v $$svg; \ - cp -p $$svg.xz debian/llvm-$(LLVM_VERSION)/usr/share/doc/llvm-$(LLVM_VERSION)/.; \ - done + if [ -d debian/llvm-$(LLVM_VERSION)/usr/share/doc/llvm-$(LLVM_VERSION) ]; then \ + for svg in usage-*.svg; do \ + [ -f $$svg ] || continue; \ + xz -9v $$svg; \ + cp -p $$svg.xz debian/llvm-$(LLVM_VERSION)/usr/share/doc/llvm-$(LLVM_VERSION)/.; \ + done; \ + fi stamps/repack_a_llvm_ir: ifeq (${LTO_ENABLE},yes) From 7862415e288dd8f15bb4d4d12086f9b3d859ccc7 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 31 Aug 2024 07:52:35 +0200 Subject: [PATCH 155/241] * Disable openmp on mips64el (ld: cannot find -lomptarget.rtl.host). --- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2fa2b11f..ab704d3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-2) UNRELEASED; urgency=medium * Fix binary-indep build. + * Disable openmp on mips64el (ld: cannot find -lomptarget.rtl.host). -- Matthias Klose Sat, 31 Aug 2024 07:41:44 +0200 diff --git a/debian/control b/debian/control index 520b55b6..57b44a94 100644 --- a/debian/control +++ b/debian/control @@ -625,7 +625,7 @@ Description: Next generation, high-performance debugger, header files Package: libomp-19-dev Section: libdevel -Architecture: amd64 arm64 armhf loong64 mips64el ppc64 ppc64el +Architecture: amd64 arm64 armhf loong64 ppc64 ppc64el Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-19-doc Breaks: libiomp-dev (<< 3.7-1) @@ -639,7 +639,7 @@ Description: LLVM OpenMP runtime - dev package Package: libomp5-19 Multi-Arch: same -Architecture: amd64 arm64 armhf loong64 mips64el ppc64 ppc64el +Architecture: amd64 arm64 armhf loong64 ppc64 ppc64el Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y diff --git a/debian/rules b/debian/rules index 8bf885c9..31d250d4 100755 --- a/debian/rules +++ b/debian/rules @@ -404,7 +404,7 @@ else endif # Enable openmp (or not) -OMP_ARCHS = amd64 arm64 armhf loong64 mips64el ppc64 ppc64el +OMP_ARCHS = amd64 arm64 armhf loong64 ppc64 ppc64el OPENMP_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH), $(OMP_ARCHS))) OPENMP_ENABLE=no From 09bac5f2def9f7fe5473c733db9acaddeb0f078d Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 31 Aug 2024 08:08:23 +0200 Subject: [PATCH 156/241] * Disable memory tracking on the Hurd and some ports architectures. --- debian/changelog | 1 + debian/control | 2 +- debian/rules | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ab704d3b..05c2387b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-2) UNRELEASED; urgency=medium * Fix binary-indep build. * Disable openmp on mips64el (ld: cannot find -lomptarget.rtl.host). + * Disable memory tracking on the Hurd and some ports architectures. -- Matthias Klose Sat, 31 Aug 2024 07:41:44 +0200 diff --git a/debian/control b/debian/control index 57b44a94..f8b19859 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, - doxygen, python3:any, python3-psutil, python3-matplotlib, + doxygen, python3:any, python3-psutil [!hurd-i386 !hurd-amd64], python3-matplotlib [!m68k !sh4 !x32 !hurd-i386 !hurd-amd64], ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], diff --git a/debian/rules b/debian/rules index 31d250d4..f03d098e 100755 --- a/debian/rules +++ b/debian/rules @@ -94,7 +94,13 @@ ifneq (,$(findstring usage-wrapper, $(TIME_COMMAND))) SUMMARY_ONLY = --summary-only endif else - USAGE_BUILD_DEP = $(EMPTY) python3:any, python3-psutil, python3-matplotlib, + USAGE_BUILD_DEP = $(EMPTY) python3:any, python3-psutil [!hurd-i386 !hurd-amd64], python3-matplotlib [!m68k !sh4 !x32 !hurd-i386 !hurd-amd64], + ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386 hurd-amd64)) + TIME_COMMAND = /bin/time -v + endif + ifneq (,$(filter $(DEB_HOST_ARCH), m68k sh4 x32)) + SUMMARY_ONLY = --summary-only + endif endif endif From ff7b81d2ed0fc7d4dc0f1918db76bc5ac01a6e2a Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 31 Aug 2024 08:10:57 +0200 Subject: [PATCH 157/241] prepare for upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 05c2387b..03b97c81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -llvm-toolchain-19 (1:19.1.0~++rc3-2) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc3-2) unstable; urgency=medium * Fix binary-indep build. * Disable openmp on mips64el (ld: cannot find -lomptarget.rtl.host). * Disable memory tracking on the Hurd and some ports architectures. - -- Matthias Klose Sat, 31 Aug 2024 07:41:44 +0200 + -- Matthias Klose Sat, 31 Aug 2024 08:10:14 +0200 llvm-toolchain-19 (1:19.1.0~++rc3-1) unstable; urgency=medium From 3ebcbd373590512b1018860a529964cc234963d8 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 31 Aug 2024 10:50:55 +0200 Subject: [PATCH 158/241] fix matplotlib warning in usage-wrapper --- debian/usage-wrapper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/usage-wrapper.py b/debian/usage-wrapper.py index ed474e80..bb06d525 100755 --- a/debian/usage-wrapper.py +++ b/debian/usage-wrapper.py @@ -15,6 +15,7 @@ except ImportError: sys.exit(1) try: + import matplotlib import matplotlib.pyplot as plt from matplotlib.lines import Line2D except ImportError: @@ -308,7 +309,7 @@ def generate_graph(time_range): mem_subplot.set_yticks(range(0, limit + 1, math.ceil(limit / 8))) mem_subplot.grid(True) - colors = list(plt.cm.get_cmap('tab20c').colors * 100) + colors = list(matplotlib.colormaps['tab20c'].colors * 100) for name, color in special_processes.items(): if name in process_name_map: colors[process_name_map[name]] = color From c121d91f1c51a1d08a656929cc5ee114952147db Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 31 Aug 2024 20:23:50 +0200 Subject: [PATCH 159/241] * Also explicitly link with -latomic on mips64el. --- debian/changelog | 6 ++++++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 03b97c81..67b82122 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium + + * Also explicitly link with -latomic on mips64el. + + -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 + llvm-toolchain-19 (1:19.1.0~++rc3-2) unstable; urgency=medium * Fix binary-indep build. diff --git a/debian/rules b/debian/rules index f03d098e..feac0f42 100755 --- a/debian/rules +++ b/debian/rules @@ -182,7 +182,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64)) STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif -ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel mipsel powerpc powerpcspe riscv64)) +ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel mipsel mips64el powerpc powerpcspe riscv64)) # For some reason, in the stage2 build, when clang is used to compile # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion # everywhere and in all stages From 9947c34d0832c8ef60b975b85f1bdf07b274b532 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 31 Aug 2024 20:29:03 +0200 Subject: [PATCH 160/241] * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host). --- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67b82122..fd729277 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium * Also explicitly link with -latomic on mips64el. + * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host). -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 diff --git a/debian/control b/debian/control index f8b19859..1cf35f16 100644 --- a/debian/control +++ b/debian/control @@ -625,7 +625,7 @@ Description: Next generation, high-performance debugger, header files Package: libomp-19-dev Section: libdevel -Architecture: amd64 arm64 armhf loong64 ppc64 ppc64el +Architecture: amd64 arm64 armhf ppc64 ppc64el Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-19-doc Breaks: libiomp-dev (<< 3.7-1) @@ -639,7 +639,7 @@ Description: LLVM OpenMP runtime - dev package Package: libomp5-19 Multi-Arch: same -Architecture: amd64 arm64 armhf loong64 ppc64 ppc64el +Architecture: amd64 arm64 armhf ppc64 ppc64el Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y diff --git a/debian/rules b/debian/rules index feac0f42..dcb36c83 100755 --- a/debian/rules +++ b/debian/rules @@ -410,7 +410,7 @@ else endif # Enable openmp (or not) -OMP_ARCHS = amd64 arm64 armhf loong64 ppc64 ppc64el +OMP_ARCHS = amd64 arm64 armhf ppc64 ppc64el OPENMP_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH), $(OMP_ARCHS))) OPENMP_ENABLE=no From 040529cc720ebacf76b6cee0cffa7c4aeda8901b Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 31 Aug 2024 22:17:11 +0200 Subject: [PATCH 161/241] * Build without z3 on sh4 (ftbfs). --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- debian/rules | 7 +++---- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd729277..0a5526b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium * Also explicitly link with -latomic on mips64el. * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host). + * Build without z3 on sh4 (ftbfs). -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 diff --git a/debian/control b/debian/control index 1cf35f16..4328d1e2 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 ppc64el riscv64 s390x], - libpfm4-dev [linux-any], python3-setuptools, libz3-dev, + libpfm4-dev [linux-any], python3-setuptools, libz3-dev [!sh4], # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled diff --git a/debian/control.in b/debian/control.in index a78e1ba8..4ac8fb6c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, ocaml-findlib [@OCAML_ARCHS@], libctypes-ocaml-dev [@OCAML_ARCHS@], dh-exec, dh-ocaml [@OCAML_ARCHS@], - libpfm4-dev [linux-any], python3-setuptools, libz3-dev, + libpfm4-dev [linux-any], python3-setuptools, libz3-dev [!sh4], # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled diff --git a/debian/rules b/debian/rules index dcb36c83..13d6b351 100755 --- a/debian/rules +++ b/debian/rules @@ -191,10 +191,9 @@ endif Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=OFF ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0) -# no ocaml support in main for Ubuntu -ifeq ($(DERIVATIVE),Debian) - Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON -endif + ifeq (,$(filter $(DEB_HOST_ARCH),sh4)) + Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON + endif endif STAGE_2_CMAKE_EXTRA += $(Z3_FLAG) From 5b03b5674a018e6f76c18e91358b52350c09497d Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 1 Sep 2024 08:45:55 +0200 Subject: [PATCH 162/241] * Also configure with -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa". --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0a5526b6..e7b7d9ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium * Also explicitly link with -latomic on mips64el. * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host). * Build without z3 on sh4 (ftbfs). + * Also configure with -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa". -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 diff --git a/debian/rules b/debian/rules index 13d6b351..d16fca4b 100755 --- a/debian/rules +++ b/debian/rules @@ -885,6 +885,7 @@ endif -DBOOTSTRAP_LLVM_VERSION_SUFFIX= \ -DBOOTSTRAP_LLVM_POLLY_LINK_INTO_TOOLS=ON \ -DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa" \ + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa" \ -DBOOTSTRAP_LLVM_LINK_LLVM_DYLIB=ON \ -DBOOTSTRAP_LLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \ -DBOOTSTRAP_CLANG_LINK_CLANG_DYLIB=ON \ From 49c2994a02cc8d466879e9d906119e2165c78264 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 1 Sep 2024 12:10:03 +0200 Subject: [PATCH 163/241] try to support old matplotlib --- debian/usage-wrapper.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/usage-wrapper.py b/debian/usage-wrapper.py index bb06d525..bf8831fb 100755 --- a/debian/usage-wrapper.py +++ b/debian/usage-wrapper.py @@ -309,7 +309,11 @@ def generate_graph(time_range): mem_subplot.set_yticks(range(0, limit + 1, math.ceil(limit / 8))) mem_subplot.grid(True) - colors = list(matplotlib.colormaps['tab20c'].colors * 100) + # Try to use the newer colormaps attribute; if not available, fallback + try: + colors = list(matplotlib.colormaps['tab20c'].colors * 100) + except AttributeError: + colors = list(plt.cm.get_cmap('tab20c').colors * 100) for name, color in special_processes.items(): if name in process_name_map: colors[process_name_map[name]] = color From 6f51761ef0c6f5d5aed777764a6787a9bbb152d7 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 3 Sep 2024 14:45:56 +0200 Subject: [PATCH 164/241] * debian/tests/*: s/18/19/. --- debian/changelog | 1 + debian/tests/cmake-clang-test | 2 +- debian/tests/cmake-llvm-test | 2 +- debian/tests/control | 12 ++++++------ debian/tests/integration-test-suite-test | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7b7d9ef..5baaa6d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host). * Build without z3 on sh4 (ftbfs). * Also configure with -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa". + * debian/tests/*: s/18/19/. -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 diff --git a/debian/tests/cmake-clang-test b/debian/tests/cmake-clang-test index 4772815a..e9f9f7c7 100755 --- a/debian/tests/cmake-clang-test +++ b/debian/tests/cmake-clang-test @@ -2,7 +2,7 @@ set -e -LLVM_VERSION=18 +LLVM_VERSION=19 # this is taken from libjsoncpp package # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we diff --git a/debian/tests/cmake-llvm-test b/debian/tests/cmake-llvm-test index 28d95b32..b3606eb5 100755 --- a/debian/tests/cmake-llvm-test +++ b/debian/tests/cmake-llvm-test @@ -2,7 +2,7 @@ set -e -LLVM_VERSION=18 +LLVM_VERSION=19 # this is taken from libjsoncpp package # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we diff --git a/debian/tests/control b/debian/tests/control index 97fdb374..7c44b631 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,23 +2,23 @@ Test-Command: bash -v ./debian/qualify-clang.sh Depends: @, cmake, make, g++, file, dpkg-dev # Comment the dbgsym package because of bug #917528 # dbgsym packages not being available in testing -# clang-18-dbgsym, libclang1-18-dbgsym +# clang-19-dbgsym, libclang1-19-dbgsym Restrictions: allow-stderr Architecture: amd64 arm64 i386 Tests: integration-test-suite-test -Depends: @, cmake, make, g++, libstdc++-13-dev +Depends: @, cmake, make, g++, libstdc++-14-dev Restrictions: allow-stderr Architecture: amd64 arm64 Tests: cmake-llvm-test -Depends: gcc, build-essential, cmake, llvm-18-dev +Depends: gcc, build-essential, cmake, llvm-19-dev Tests: cmake-clang-test -Depends: gcc, build-essential, cmake, llvm-18-dev, clang-18, libclang-18-dev +Depends: gcc, build-essential, cmake, llvm-19-dev, clang-19, libclang-19-dev Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)" -Depends: python3-lldb-18 +Depends: python3-lldb-19 Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)" -Depends: python3-clang-18 +Depends: python3-clang-19 diff --git a/debian/tests/integration-test-suite-test b/debian/tests/integration-test-suite-test index 3524400b..efc23d2a 100755 --- a/debian/tests/integration-test-suite-test +++ b/debian/tests/integration-test-suite-test @@ -2,7 +2,7 @@ set -e -LLVM_VERSION=18 +LLVM_VERSION=19 # this is taken from libjsoncpp package # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we From d37c16d32b7bc2c8d36630b8be71de039b4f6d10 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 3 Sep 2024 14:47:11 +0200 Subject: [PATCH 165/241] * debian/qualify-clang.sh: Don't check for libclang-cpp.so.$VERSION symlink. --- debian/changelog | 1 + debian/qualify-clang.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5baaa6d2..f6e8ffa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium * Build without z3 on sh4 (ftbfs). * Also configure with -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa". * debian/tests/*: s/18/19/. + * debian/qualify-clang.sh: Don't check for libclang-cpp.so.$VERSION symlink. -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index c884e3c8..4fe0afbc 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -486,7 +486,7 @@ check_symlink() { fi } -check_symlink "libclang-cpp.so.$VERSION" +# check_symlink "libclang-cpp.so.$VERSION" why is that one needed? check_symlink "libclang-$VERSION.so" check_symlink "libclang.so" From 24cd1284b37711e5882213760242da0ce31bbb55 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Sep 2024 14:57:33 +0200 Subject: [PATCH 166/241] Remove the cmake dependency on libLibcTableGenUtil.a see https://github.com/llvm/llvm-project/issues/99819 --- debian/changelog | 7 ++++++- debian/rules | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5baaa6d2..78bcb1d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,17 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium + [ Matthias Klose ] * Also explicitly link with -latomic on mips64el. * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host). * Build without z3 on sh4 (ftbfs). * Also configure with -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa". * debian/tests/*: s/18/19/. - -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 + [ Sylvestre Ledru ] + * Remove the cmake dependency on libLibcTableGenUtil.a + see https://github.com/llvm/llvm-project/issues/99819 + + -- Sylvestre Ledru Tue, 03 Sep 2024 14:56:07 +0200 llvm-toolchain-19 (1:19.1.0~++rc3-2) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index d16fca4b..0e508846 100755 --- a/debian/rules +++ b/debian/rules @@ -1329,7 +1329,7 @@ endif rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT # Disable CMake's package validation checks for target files that we may remove. - sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|omptarget\|omp\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|LibcTableGenUtil\|omptarget\|omp\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake # Also disable mlir-* checks in the cmake sed -i '/_IMPORT_CHECK_TARGETS \(mlir-\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake @@ -1337,7 +1337,7 @@ endif sed -i '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i '/_IMPORT_CHECK_FILES_FOR_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|Polly\|MLIR\|LibcTableGenUtil\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake - sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake + sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|LibcTableGenUtil\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake # Disable CMake's package validation checks for binaries that may not be installed sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake From 7595db38bd56efd89493c033bfb44a8da3664339 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 3 Sep 2024 15:01:44 +0200 Subject: [PATCH 167/241] * Add hurd-amd64 support. --- debian/changelog | 4 ++++ debian/control | 4 ++-- debian/rules | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6e8ffa9..dd4c8ff7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium + [ Matthias Klose ] * Also explicitly link with -latomic on mips64el. * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host). * Build without z3 on sh4 (ftbfs). @@ -7,6 +8,9 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium * debian/tests/*: s/18/19/. * debian/qualify-clang.sh: Don't check for libclang-cpp.so.$VERSION symlink. + [ Samuel Thibault ] + * Add hurd-amd64 support. + -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 llvm-toolchain-19 (1:19.1.0~++rc3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 4328d1e2..ce250421 100644 --- a/debian/control +++ b/debian/control @@ -625,7 +625,7 @@ Description: Next generation, high-performance debugger, header files Package: libomp-19-dev Section: libdevel -Architecture: amd64 arm64 armhf ppc64 ppc64el +Architecture: amd64 arm64 armhf ppc64 ppc64el hurd-amd64 Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-19-doc Breaks: libiomp-dev (<< 3.7-1) @@ -639,7 +639,7 @@ Description: LLVM OpenMP runtime - dev package Package: libomp5-19 Multi-Arch: same -Architecture: amd64 arm64 armhf ppc64 ppc64el +Architecture: amd64 arm64 armhf ppc64 ppc64el hurd-amd64 Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y diff --git a/debian/rules b/debian/rules index d16fca4b..6052829b 100755 --- a/debian/rules +++ b/debian/rules @@ -348,7 +348,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV) endif -BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 +BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 hurd-amd64 kfreebsd-amd64 kfreebsd-i386 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0) ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold @@ -396,7 +396,7 @@ endif # Enable libunwind (or not) LIBUNWIND_ENABLE=yes -ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel mips64el hurd-i386 powerpc sparc sparc64 x32)) +ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel mips64el hurd-i386 hurd-amd64 powerpc sparc sparc64 x32)) LIBUNWIND_ENABLE=no # do not use compiler-rt builtins for libcxx (libcxxabi) when libunwind is # disabled since the gnu implementation in libgcc_s will then be required @@ -409,7 +409,7 @@ else endif # Enable openmp (or not) -OMP_ARCHS = amd64 arm64 armhf ppc64 ppc64el +OMP_ARCHS = amd64 arm64 armhf ppc64 ppc64el hurd-amd64 OPENMP_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH), $(OMP_ARCHS))) OPENMP_ENABLE=no @@ -474,7 +474,7 @@ else endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64 mips64el mipsel +LLDB_DISABLE_ARCHS := hurd-amd64 hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64 mips64el mipsel # hurd has threading issues ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) # Disable LLDB for this arch. From 769288aae6e0e779bcc0e7caa374d3f3150905fc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Sep 2024 16:51:32 +0200 Subject: [PATCH 168/241] New snapshot release --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d332c9bd..626d1001 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc4-1) unstable; urgency=medium [ Matthias Klose ] * Also explicitly link with -latomic on mips64el. @@ -14,8 +14,9 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium [ Sylvestre Ledru ] * Remove the cmake dependency on libLibcTableGenUtil.a see https://github.com/llvm/llvm-project/issues/99819 + * New snapshot release - -- Sylvestre Ledru Tue, 03 Sep 2024 14:56:07 +0200 + -- Sylvestre Ledru Tue, 03 Sep 2024 16:51:13 +0200 llvm-toolchain-19 (1:19.1.0~++rc3-2) unstable; urgency=medium From 4f5d22095ed9418a9663629d5a413711ef3c635c Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 3 Sep 2024 19:18:25 +0200 Subject: [PATCH 169/241] * libllvm19: Restore the symlink /usr/lib/llvm-19/lib/libLLVM.so.1, apparently CMake's LLVMExports.cmake requires it. But why? --- debian/changelog | 2 ++ debian/libllvmX.Y.links.in | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 626d1001..bb4cccf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ llvm-toolchain-19 (1:19.1.0~++rc4-1) unstable; urgency=medium * Also configure with -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa". * debian/tests/*: s/18/19/. * debian/qualify-clang.sh: Don't check for libclang-cpp.so.$VERSION symlink. + * libllvm19: Restore the symlink /usr/lib/llvm-19/lib/libLLVM.so.1, apparently + CMake's LLVMExports.cmake requires it. But why? [ Samuel Thibault ] * Add hurd-amd64 support. diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 2c3e5bbd..8166bf82 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -3,6 +3,16 @@ # symlink to the soname in the llvm libdir usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ +# FIXME: CMake requires this file, but for what? Fix LLVMExports.cmake instead? +# +# CMake Error at /usr/lib/llvm-19/lib/cmake/llvm/LLVMExports.cmake:1908 (message): +# The imported target "LLVM" references the file +# +# "/usr/lib/llvm-19/lib/libLLVM.so.1" +# +# but this file does not exist. +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 + # FIXME: why is this one needed? This already is in the llvm-dev package in the llvm libdir # create symlink to the symlink installed by upstream #usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so From 4ba22a9c8ae76e0c4d20683e1c3acbb153da090a Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 3 Sep 2024 19:30:36 +0200 Subject: [PATCH 170/241] fix version number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bb4cccf0..4e2cda81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0~++rc4-1) unstable; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium [ Matthias Klose ] * Also explicitly link with -latomic on mips64el. From 48af4f7bc6bbff4bf66db6cf1c780ef1ebd131ad Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 3 Sep 2024 22:01:28 +0200 Subject: [PATCH 171/241] * New release candidate. --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e2cda81..d75cb722 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc4-1) unstable; urgency=medium + + * New release candidate. [ Matthias Klose ] * Also explicitly link with -latomic on mips64el. @@ -18,7 +20,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium see https://github.com/llvm/llvm-project/issues/99819 * New snapshot release - -- Sylvestre Ledru Tue, 03 Sep 2024 16:51:13 +0200 + -- Matthias Klose Tue, 03 Sep 2024 21:48:12 +0200 llvm-toolchain-19 (1:19.1.0~++rc3-2) unstable; urgency=medium From 2661c00c67a7c904e1cf43ae9e4c2447d44260e0 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 4 Sep 2024 11:53:56 +0200 Subject: [PATCH 172/241] * Disable z3 again for Ubuntu, and make the libz3-dev (build) dependency conditional. --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/control.in | 4 ++-- debian/rules | 13 ++++++++++--- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index d75cb722..b2f46add 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-19 (1:19.1.0~++rc4-2) UNRELEASED; urgency=medium + + * Disable z3 again for Ubuntu, and make the libz3-dev (build) dependency + conditional. + + -- Matthias Klose Wed, 04 Sep 2024 11:52:22 +0200 + llvm-toolchain-19 (1:19.1.0~++rc4-1) unstable; urgency=medium * New release candidate. diff --git a/debian/control b/debian/control index ce250421..5582e485 100644 --- a/debian/control +++ b/debian/control @@ -421,7 +421,7 @@ Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, llvm-19 (= ${binary:Version}), libllvm19 (= ${binary:Version}), libncurses-dev, llvm-19-tools (= ${binary:Version}), libclang-cpp19 (= ${binary:Version}), - libz3-dev, libxml2-dev + libxml2-dev, libz3-dev [!sh4], Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other diff --git a/debian/control.in b/debian/control.in index 4ac8fb6c..271607f2 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, ocaml-findlib [@OCAML_ARCHS@], libctypes-ocaml-dev [@OCAML_ARCHS@], dh-exec, dh-ocaml [@OCAML_ARCHS@], - libpfm4-dev [linux-any], python3-setuptools, libz3-dev [!sh4], + libpfm4-dev [linux-any], python3-setuptools, @Z3_DEV_DEP@ # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled @@ -421,7 +421,7 @@ Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@ (= ${binary:Version}), libncurses-dev, llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@ (= ${binary:Version}), - libz3-dev, libxml2-dev + libxml2-dev, @Z3_DEV_DEP@ Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other diff --git a/debian/rules b/debian/rules index bd6db5f8..ff43ef4c 100755 --- a/debian/rules +++ b/debian/rules @@ -190,12 +190,18 @@ LDFLAGS_EXTRA += -latomic endif Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=OFF -ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0) - ifeq (,$(filter $(DEB_HOST_ARCH),sh4)) - Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON +# no ocaml support in main for Ubuntu +ifneq ($(DERIVATIVE),Ubuntu) + ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0) + ifeq (,$(filter $(DEB_HOST_ARCH),sh4)) + Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON + endif endif endif STAGE_2_CMAKE_EXTRA += $(Z3_FLAG) +ifneq (,$(findstring =ON, $(Z3_FLAG))) + Z3_DEV_DEP = libz3-dev [!sh4], +endif # Change the default CPU for s390x ZARCH=z196 @@ -678,6 +684,7 @@ stamps/preconfigure: echo "$$f => $$f2"; \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ -e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \ + -e "s|@Z3_DEV_DEP@|$(Z3_DEV_DEP)|g" \ -e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \ -e "s|@OCAML_ARCHS@|$(OCAML_ARCHS)|g" \ -e "s|@OMP_ARCHS@|$(OMP_ARCHS)|g" \ From 0231acb556e4e0510316a399dd45c590f9959109 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 4 Sep 2024 15:13:23 +0200 Subject: [PATCH 173/241] * Use -mxgot on mips64el. * Disable tests on mips64el, they do timeout. --- debian/changelog | 2 ++ debian/rules | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b2f46add..bb69281d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ llvm-toolchain-19 (1:19.1.0~++rc4-2) UNRELEASED; urgency=medium * Disable z3 again for Ubuntu, and make the libz3-dev (build) dependency conditional. + * Use -mxgot on mips64el. + * Disable tests on mips64el, they do timeout. -- Matthias Klose Wed, 04 Sep 2024 11:52:22 +0200 diff --git a/debian/rules b/debian/rules index ff43ef4c..1631fd9a 100755 --- a/debian/rules +++ b/debian/rules @@ -262,6 +262,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) # avoid an issue with search path on mips64el # https://bugs.llvm.org/show_bug.cgi?id=41204 STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64 + CFLAGS_EXTRA += -mxgot + CXXFLAGS_EXTRA += -mxgot endif ifneq (,$(filter $(DEB_HOST_ARCH),powerpc)) @@ -442,7 +444,7 @@ endif endif # llvm tests timeout, disable it on mipsel and x32 -ifneq (,$(filter $(DEB_HOST_ARCH), mipsel x32)) +ifneq (,$(filter $(DEB_HOST_ARCH), mipsel mips64el x32)) RUN_TEST=no endif From 3dccce9c919f491f838edd5d519f272425862912 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 5 Sep 2024 10:58:21 +0200 Subject: [PATCH 174/241] prepare for upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb69281d..9f9a57c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -llvm-toolchain-19 (1:19.1.0~++rc4-2) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc4-2) unstable; urgency=medium * Disable z3 again for Ubuntu, and make the libz3-dev (build) dependency conditional. * Use -mxgot on mips64el. * Disable tests on mips64el, they do timeout. - -- Matthias Klose Wed, 04 Sep 2024 11:52:22 +0200 + -- Matthias Klose Wed, 04 Sep 2024 15:16:40 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-1) unstable; urgency=medium From c8782ccf2a41889ff99745b2a2f43daeb43646a8 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 5 Sep 2024 11:28:29 +0200 Subject: [PATCH 175/241] * Consolidate disabling CMake's package validation checks a bit. --- debian/changelog | 6 ++++++ debian/rules | 24 +++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f9a57c1..f3014df3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium + + * Consolidate disabling CMake's package validation checks a bit. + + -- Matthias Klose Thu, 05 Sep 2024 10:59:19 +0200 + llvm-toolchain-19 (1:19.1.0~++rc4-2) unstable; urgency=medium * Disable z3 again for Ubuntu, and make the libz3-dev (build) dependency diff --git a/debian/rules b/debian/rules index 1631fd9a..e3d0160c 100755 --- a/debian/rules +++ b/debian/rules @@ -1337,19 +1337,25 @@ endif # Remove some license files rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT -# Disable CMake's package validation checks for target files that we may remove. - sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|LibcTableGenUtil\|omptarget\|omp\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake +# Disable CMake's LLVMExports package validation checks for target files that we may remove. + sed -i \ + -e '/_cmake_import_check_targets \(Polly\|sancov\|llvm-omp-device-info\|LibcTableGenUtil\|omptarget\|omp\)/ {s|^|#|}' \ + $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake # Also disable mlir-* checks in the cmake - sed -i '/_IMPORT_CHECK_TARGETS \(mlir-\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + sed -i \ + -e '/_cmake_import_check_targets \(mlir-\|MLIR\)/ {s|^|#|}' \ + $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake - sed -i '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake - sed -i '/_IMPORT_CHECK_FILES_FOR_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake - sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|Polly\|MLIR\|LibcTableGenUtil\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake - sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|LibcTableGenUtil\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake + sed -i \ + -e '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}' \ + $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake \ + $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake -# Disable CMake's package validation checks for binaries that may not be installed - sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake + sed -i \ + -e '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|LibcTableGenUtil\|omp\|omptarget\)/ {s|^|#|}' \ + $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake \ + $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake # Managed in python*-lldb-X.Y.links.in rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/_lldb.so From 7aabbf3c74c50c9142b8fd69b12ed1082088f506 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 5 Sep 2024 13:26:26 +0200 Subject: [PATCH 176/241] * debian/qualify-clang.sh: Skip OpenMP test, if libomp-dev is not available. --- debian/changelog | 1 + debian/qualify-clang.sh | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index f3014df3..14056bf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Consolidate disabling CMake's package validation checks a bit. + * debian/qualify-clang.sh: Skip OpenMP test, if libomp-dev is not available. -- Matthias Klose Thu, 05 Sep 2024 10:59:19 +0200 diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 4fe0afbc..56a45b95 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -918,12 +918,8 @@ fi rm part1.o part2.o fi -if test ! -f /usr/lib/llvm-$VERSION/lib/libomp.so; then - echo "Install libomp-$VERSION-dev"; - exit -1; -fi - # OpenMP +if dpkg -l libomp-$VERSION-dev >/dev/null 2>&1; then cat < foo.c //test.c #include "omp.h" @@ -936,6 +932,9 @@ int main(void) { EOF clang-$VERSION foo.c -fopenmp -o o ./o > /dev/null +else + echo "OpenMP check skipped, no libomp-$VERSION-dev available." +fi if test ! -f /usr/lib/llvm-$VERSION/include/c++/v1/vector; then echo "Install libc++-$VERSION-dev"; From 280e8533339d967063b01be14a127e26f3afd0a7 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 6 Sep 2024 13:22:32 +0200 Subject: [PATCH 177/241] * Disable CMake's package validation check for libLLVM.so.1. --- debian/changelog | 1 + debian/rules | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 14056bf8..46cddf91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Consolidate disabling CMake's package validation checks a bit. * debian/qualify-clang.sh: Skip OpenMP test, if libomp-dev is not available. + * Disable CMake's package validation check for libLLVM.so.1. -- Matthias Klose Thu, 05 Sep 2024 10:59:19 +0200 diff --git a/debian/rules b/debian/rules index e3d0160c..26a166cc 100755 --- a/debian/rules +++ b/debian/rules @@ -1342,6 +1342,12 @@ endif -e '/_cmake_import_check_targets \(Polly\|sancov\|llvm-omp-device-info\|LibcTableGenUtil\|omptarget\|omp\)/ {s|^|#|}' \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake +# the obscure libLLVM.so.1 file ... + sed -i \ + -e '/_cmake_import_check_targets LLVM/ {s|^|#|}' \ + -e '/_cmake_import_check_files_for_.*\/libLLVM\.so\.1.*/ {s|^|#|}' \ + $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + # Also disable mlir-* checks in the cmake sed -i \ -e '/_cmake_import_check_targets \(mlir-\|MLIR\)/ {s|^|#|}' \ From 8244d1d35d2a8ede03f75cb0c5616aaf8228188e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Sep 2024 06:53:39 +0200 Subject: [PATCH 178/241] * Limit lldb autopkg test to the lldb architectures. * Generate debian/tests/* files. --- debian/changelog | 2 ++ debian/rules | 3 +- debian/tests/cmake-clang-test.in | 29 +++++++++++++++ debian/tests/cmake-llvm-test.in | 39 +++++++++++++++++++++ debian/tests/control | 1 + debian/tests/control.in | 25 +++++++++++++ debian/tests/integration-test-suite-test.in | 39 +++++++++++++++++++++ 7 files changed, 137 insertions(+), 1 deletion(-) create mode 100755 debian/tests/cmake-clang-test.in create mode 100755 debian/tests/cmake-llvm-test.in create mode 100644 debian/tests/control.in create mode 100755 debian/tests/integration-test-suite-test.in diff --git a/debian/changelog b/debian/changelog index 46cddf91..dd462676 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Consolidate disabling CMake's package validation checks a bit. * debian/qualify-clang.sh: Skip OpenMP test, if libomp-dev is not available. * Disable CMake's package validation check for libLLVM.so.1. + * Limit lldb autopkg test to the lldb architectures. + * Generate debian/tests/* files. -- Matthias Klose Thu, 05 Sep 2024 10:59:19 +0200 diff --git a/debian/rules b/debian/rules index 26a166cc..567237ec 100755 --- a/debian/rules +++ b/debian/rules @@ -681,7 +681,7 @@ stamps/preconfigure: @echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)" @echo "DOC_GENERATION=$(DOC_GENERATION)" - for f in debian/*.in; do \ + for f in debian/*.in debian/tests/*.in; do \ f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ echo "$$f => $$f2"; \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ @@ -698,6 +698,7 @@ stamps/preconfigure: -e "s|@LLVM_VERSION_MINOR@|$(LLVM_VERSION_MINOR)|g" \ -e "s|@LLVM_VERSION_NEXT@|$(LLVM_VERSION_NEXT)|g" \ -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \ + [ -x $$f ] && chmod +x $$f2; \ done # Make install file executable for dh-exec diff --git a/debian/tests/cmake-clang-test.in b/debian/tests/cmake-clang-test.in new file mode 100755 index 00000000..19891735 --- /dev/null +++ b/debian/tests/cmake-clang-test.in @@ -0,0 +1,29 @@ +#!/bin/sh + +set -e + +LLVM_VERSION=@LLVM_VERSION@ + +# this is taken from libjsoncpp package +# Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we +# can avoid duplicating the effort (signal handling, etc.) here. +if [ -z "$AUTOPKGTEST_TMP" ] +then + echo "Required envvar AUTOPKGTEST_TMP \"$AUTOPKGTEST_TMP\" is not set" >&2 + exit 1 +fi + + +# the idea was taken from spirv-llvm-translator package + +cd "$AUTOPKGTEST_TMP" +cat < CMakeLists.txt +cmake_minimum_required(VERSION 3.22) +project(cmake-clang-test) +find_package(Clang $LLVM_VERSION.1 REQUIRED) + +EOF + + +mkdir build && cd build +cmake .. diff --git a/debian/tests/cmake-llvm-test.in b/debian/tests/cmake-llvm-test.in new file mode 100755 index 00000000..3c7da843 --- /dev/null +++ b/debian/tests/cmake-llvm-test.in @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +LLVM_VERSION=@LLVM_VERSION@ + +# this is taken from libjsoncpp package +# Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we +# can avoid duplicating the effort (signal handling, etc.) here. +if [ -z "$AUTOPKGTEST_TMP" ] +then + echo "Required envvar AUTOPKGTEST_TMP \"$AUTOPKGTEST_TMP\" is not set" >&2 + exit 1 +fi + + +# the idea was taken from spirv-llvm-translator package + +cd "$AUTOPKGTEST_TMP" +cat < CMakeLists.txt +cmake_minimum_required(VERSION 3.22) +project(cmake-llvm-test) +find_package(LLVM $LLVM_VERSION.1 REQUIRED + COMPONENTS + Analysis + BitReader + BitWriter + Core + Support + TransformUtils + llvm-as + llvm-dis +) + +EOF + + +mkdir build && cd build +cmake .. diff --git a/debian/tests/control b/debian/tests/control index 7c44b631..94b20ede 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -19,6 +19,7 @@ Depends: gcc, build-essential, cmake, llvm-19-dev, clang-19, libclang-19-dev Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)" Depends: python3-lldb-19 +Architecture: amd64 arm64 armel armhf i386 ppc64el s390x Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)" Depends: python3-clang-19 diff --git a/debian/tests/control.in b/debian/tests/control.in new file mode 100644 index 00000000..08435165 --- /dev/null +++ b/debian/tests/control.in @@ -0,0 +1,25 @@ +Test-Command: bash -v ./debian/qualify-clang.sh +Depends: @, cmake, make, g++, file, dpkg-dev +# Comment the dbgsym package because of bug #917528 +# dbgsym packages not being available in testing +# clang-@LLVM_VERSION@-dbgsym, libclang1-@LLVM_VERSION@-dbgsym +Restrictions: allow-stderr +Architecture: amd64 arm64 i386 + +Tests: integration-test-suite-test +Depends: @, cmake, make, g++, libstdc++-14-dev +Restrictions: allow-stderr +Architecture: amd64 arm64 + +Tests: cmake-llvm-test +Depends: gcc, build-essential, cmake, llvm-@LLVM_VERSION@-dev + +Tests: cmake-clang-test +Depends: gcc, build-essential, cmake, llvm-@LLVM_VERSION@-dev, clang-@LLVM_VERSION@, libclang-@LLVM_VERSION@-dev + +Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)" +Depends: python3-lldb-@LLVM_VERSION@ +Architecture: amd64 arm64 armel armhf i386 ppc64el s390x + +Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)" +Depends: python3-clang-@LLVM_VERSION@ diff --git a/debian/tests/integration-test-suite-test.in b/debian/tests/integration-test-suite-test.in new file mode 100755 index 00000000..81bbde09 --- /dev/null +++ b/debian/tests/integration-test-suite-test.in @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +LLVM_VERSION=@LLVM_VERSION@ + +# this is taken from libjsoncpp package +# Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we +# can avoid duplicating the effort (signal handling, etc.) here. +if [ -z "$AUTOPKGTEST_TMP" ] +then + echo "Required envvar AUTOPKGTEST_TMP \"$AUTOPKGTEST_TMP\" is not set" >&2 + exit 1 +fi + +# Copy the integration repo to the temp dir +cp -Rv integration-test-suite/* "$AUTOPKGTEST_TMP"/ +cd "$AUTOPKGTEST_TMP" + +mkdir build +cd build +cmake -DLIT=/usr/lib/llvm-$LLVM_VERSION/build/utils/lit/lit.py \ + -DCLANG_BINARY=/usr/bin/clang-$LLVM_VERSION \ + -DCLANGXX_BINARY=/usr/bin/clang++-$LLVM_VERSION \ + -DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-$LLVM_VERSION \ + -DCLANG_FORMAT_BINARY=/usr/bin/clang-format-$LLVM_VERSION \ + -DLLD_BINARY=/usr/bin/lld-$LLVM_VERSION \ + -DLLDB_BINARY=/usr/bin/lldb-$LLVM_VERSION \ + -DLLVMCONFIG_BINARY=/usr/bin/llvm-config-$LLVM_VERSION \ + -DOPT_BINARY=/usr/bin/opt-$LLVM_VERSION \ + -DSCANBUILD=/usr/bin/scan-build-$LLVM_VERSION \ + -DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-$LLVM_VERSION \ + -DSCANVIEW=/usr/bin/scan-view-$LLVM_VERSION \ + -DLLVMNM=/usr/bin/llvm-nm-$LLVM_VERSION \ + -DLLVMPROFDATA=/usr/bin/llvm-profdata-$LLVM_VERSION \ + -DENABLE_COMPILER_RT=OFF \ + -DENABLE_LIBCXX=ON \ + -DLLVM_CMAKE_PREFIX_PATH=/usr/lib/llvm-$LLVM_VERSION/lib/cmake/ ../ +make check From 1866bfaf3a93635672b1530e983daec0c13d3ff3 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Sep 2024 15:05:01 +0200 Subject: [PATCH 179/241] * Disable the usage-wrapper/memory tracking by default. --- debian/changelog | 1 + debian/control | 2 +- debian/rules | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd462676..3d7d28be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Disable CMake's package validation check for libLLVM.so.1. * Limit lldb autopkg test to the lldb architectures. * Generate debian/tests/* files. + * Disable the usage-wrapper/memory tracking by default. -- Matthias Klose Thu, 05 Sep 2024 10:59:19 +0200 diff --git a/debian/control b/debian/control index 5582e485..d33fa110 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, - doxygen, python3:any, python3-psutil [!hurd-i386 !hurd-amd64], python3-matplotlib [!m68k !sh4 !x32 !hurd-i386 !hurd-amd64], + doxygen, ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], diff --git a/debian/rules b/debian/rules index 567237ec..09ad377f 100755 --- a/debian/rules +++ b/debian/rules @@ -85,8 +85,8 @@ NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' / awk -vn=$(NCPUS) -vmt=$$mt -vm=$(MEM_PER_CPU) \ 'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2 Date: Sat, 22 Jun 2024 12:18:57 +0200 Subject: [PATCH 180/241] Enable lldb on riscv64 It has been supported for a few releases but not enabled on the debian side. This should fix the autopkgtest on riscv64 (cherry picked from commit 4cf15e66711010d2c01fe59ed46522e9c6317922) --- debian/changelog | 4 ++++ debian/control | 16 ++++++++-------- debian/control.in | 16 ++++++++-------- debian/rules | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d7d28be..f74ff769 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium + [ Matthias Klose ] * Consolidate disabling CMake's package validation checks a bit. * debian/qualify-clang.sh: Skip OpenMP test, if libomp-dev is not available. * Disable CMake's package validation check for libLLVM.so.1. @@ -7,6 +8,9 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Generate debian/tests/* files. * Disable the usage-wrapper/memory tracking by default. + [ Aurelien Jarno ] + * Enable lldb on riscv64. + -- Matthias Klose Thu, 05 Sep 2024 10:59:19 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index d33fa110..420cc01d 100644 --- a/debian/control +++ b/debian/control @@ -565,8 +565,8 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-19 -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}), python3-lldb-19 Pre-Depends: ${misc:Pre-Depends} @@ -577,8 +577,8 @@ Description: Next generation, high-performance debugger Package: liblldb-19 Provides: ${t64:Provides} -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -591,8 +591,8 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-19 Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-19 (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -607,8 +607,8 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-19-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files diff --git a/debian/control.in b/debian/control.in index 271607f2..4257d6d5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -565,8 +565,8 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}), python3-lldb-@LLVM_VERSION@ Pre-Depends: ${misc:Pre-Depends} @@ -577,8 +577,8 @@ Description: Next generation, high-performance debugger Package: liblldb-@LLVM_VERSION@ Provides: ${t64:Provides} -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -591,8 +591,8 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-@LLVM_VERSION@ Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -607,8 +607,8 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 -# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files diff --git a/debian/rules b/debian/rules index 09ad377f..82f874f8 100755 --- a/debian/rules +++ b/debian/rules @@ -482,7 +482,7 @@ else endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := hurd-amd64 hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64 mips64el mipsel +LLDB_DISABLE_ARCHS := hurd-amd64 hurd-i386 ia64 powerpc powerpcspe ppc64 sparc64 mips64el mipsel # hurd has threading issues ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) # Disable LLDB for this arch. From 7ad01b3bd44a95d336144165757b6bdce57a8387 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sun, 8 Sep 2024 15:03:43 +0200 Subject: [PATCH 181/241] Enable lldb autopkgtest on riscv64. --- debian/changelog | 1 + debian/tests/control | 2 +- debian/tests/control.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f74ff769..cd615baf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium [ Aurelien Jarno ] * Enable lldb on riscv64. + * Enable lldb autopkgtest on riscv64. -- Matthias Klose Thu, 05 Sep 2024 10:59:19 +0200 diff --git a/debian/tests/control b/debian/tests/control index 94b20ede..c8a86385 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -19,7 +19,7 @@ Depends: gcc, build-essential, cmake, llvm-19-dev, clang-19, libclang-19-dev Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)" Depends: python3-lldb-19 -Architecture: amd64 arm64 armel armhf i386 ppc64el s390x +Architecture: amd64 arm64 armel armhf i386 ppc64el riscv64 s390x Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)" Depends: python3-clang-19 diff --git a/debian/tests/control.in b/debian/tests/control.in index 08435165..e3ec60b4 100644 --- a/debian/tests/control.in +++ b/debian/tests/control.in @@ -19,7 +19,7 @@ Depends: gcc, build-essential, cmake, llvm-@LLVM_VERSION@-dev, clang-@LLVM_VERSI Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)" Depends: python3-lldb-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 ppc64el s390x +Architecture: amd64 arm64 armel armhf i386 ppc64el riscv64 s390x Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)" Depends: python3-clang-@LLVM_VERSION@ From cb93535be6fafe8a35c4e88edcd5c80794022d5d Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Sep 2024 16:40:27 +0200 Subject: [PATCH 182/241] * Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro. --- debian/changelog | 1 + debian/control | 6 ++---- debian/control.in | 6 ++---- debian/rules | 10 ++++------ 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd615baf..21d74b8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Limit lldb autopkg test to the lldb architectures. * Generate debian/tests/* files. * Disable the usage-wrapper/memory tracking by default. + * Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro. [ Aurelien Jarno ] * Enable lldb on riscv64. diff --git a/debian/control b/debian/control index 420cc01d..57b45a98 100644 --- a/debian/control +++ b/debian/control @@ -565,8 +565,7 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-19 -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 loong64 m68k ppc64el riscv64 s390x x32 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}), python3-lldb-19 Pre-Depends: ${misc:Pre-Depends} @@ -577,8 +576,7 @@ Description: Next generation, high-performance debugger Package: liblldb-19 Provides: ${t64:Provides} -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 loong64 m68k ppc64el riscv64 s390x x32 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs diff --git a/debian/control.in b/debian/control.in index 4257d6d5..c907a1c4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -565,8 +565,7 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +Architecture: @LLDB_ARCHS@ Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}), python3-lldb-@LLVM_VERSION@ Pre-Depends: ${misc:Pre-Depends} @@ -577,8 +576,7 @@ Description: Next generation, high-performance debugger Package: liblldb-@LLVM_VERSION@ Provides: ${t64:Provides} -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +Architecture: @LLDB_ARCHS@ Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs diff --git a/debian/rules b/debian/rules index 82f874f8..be977954 100755 --- a/debian/rules +++ b/debian/rules @@ -481,13 +481,10 @@ else COVERITY_ENABLE=0 endif -LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := hurd-amd64 hurd-i386 ia64 powerpc powerpcspe ppc64 sparc64 mips64el mipsel +LLDB_ENABLE=no # hurd has threading issues -ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) -# Disable LLDB for this arch. - LLDB_ENABLE=no -else +LLDB_ARCHS := amd64 arm64 armel armhf i386 loong64 m68k ppc64el riscv64 s390x x32 +ifneq (,$(filter $(DEB_HOST_ARCH),$(LLDB_ARCHS))) STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_LUA=OFF PROJECTS+=;lldb endif @@ -688,6 +685,7 @@ stamps/preconfigure: -e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \ -e "s|@Z3_DEV_DEP@|$(Z3_DEV_DEP)|g" \ -e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \ + -e "s|@LLDB_ARCHS@|$(LLDB_ARCHS)|g" \ -e "s|@OCAML_ARCHS@|$(OCAML_ARCHS)|g" \ -e "s|@OMP_ARCHS@|$(OMP_ARCHS)|g" \ -e "s|@FLANG_ARCHS@|$(FLANG_ARCHS)|g" \ From c273117b98f5acc785a2ff65fb407f337bf115a0 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Sep 2024 16:46:40 +0200 Subject: [PATCH 183/241] * Remove unused kfreebsd patches, and remove references to kfreebsd and s390. --- debian/changelog | 1 + debian/control | 16 +- debian/control.in | 10 +- debian/patches/kfreebsd/CMakeLists.txt.diff | 13 - .../kfreebsd/clang_lib_Basic_Targets.diff | 48 -- debian/patches/kfreebsd/compiler-rt_lib.diff | 374 ----------- .../kfreebsd/include_llvm_ADT_Triple.h.diff | 33 - .../kfreebsd-libcxx-threads-detection.diff | 12 - debian/patches/kfreebsd/kfreebsd-openmp.diff | 129 ---- .../kfreebsd/kfreebsd-threads-build.diff | 13 - .../kfreebsd/kfreebsd-triple-clang.diff | 615 ------------------ debian/patches/kfreebsd/kfreebsd-triple.diff | 23 - debian/patches/kfreebsd/lib_Support.diff | 35 - debian/patches/kfreebsd/lib_Target_X86.diff | 26 - .../lldb_source_Host_freebsd_Host.cpp.diff | 18 - .../lldb_source_Plugins_Process_FreeBSD.diff | 28 - .../tools_llvm-shlib_CMakeLists.txt.diff | 12 - debian/patches/series | 16 - debian/rules | 10 +- 19 files changed, 19 insertions(+), 1413 deletions(-) delete mode 100644 debian/patches/kfreebsd/CMakeLists.txt.diff delete mode 100644 debian/patches/kfreebsd/clang_lib_Basic_Targets.diff delete mode 100644 debian/patches/kfreebsd/compiler-rt_lib.diff delete mode 100644 debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff delete mode 100644 debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff delete mode 100644 debian/patches/kfreebsd/kfreebsd-openmp.diff delete mode 100644 debian/patches/kfreebsd/kfreebsd-threads-build.diff delete mode 100644 debian/patches/kfreebsd/kfreebsd-triple-clang.diff delete mode 100644 debian/patches/kfreebsd/kfreebsd-triple.diff delete mode 100644 debian/patches/kfreebsd/lib_Support.diff delete mode 100644 debian/patches/kfreebsd/lib_Target_X86.diff delete mode 100644 debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff delete mode 100644 debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff delete mode 100644 debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff diff --git a/debian/changelog b/debian/changelog index 21d74b8a..89eb961c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Generate debian/tests/* files. * Disable the usage-wrapper/memory tracking by default. * Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro. + * Remove unused kfreebsd patches, and remove references to kfreebsd and s390. [ Aurelien Jarno ] * Enable lldb on riscv64. diff --git a/debian/control b/debian/control index 57b45a98..fef5454f 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libipt-dev [amd64 i386], lcov, procps, help2man, zlib1g-dev, libzstd-dev, - g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], + g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen, ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], @@ -525,7 +525,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-19 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -535,7 +535,7 @@ Description: LLVM-based linker Project. Package: liblld-19 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -549,7 +549,7 @@ Description: LLVM-based linker, library Package: liblld-19-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-19 (= ${binary:Version}), liblld-19 (= ${binary:Version}), libzstd-dev, zlib1g-dev @@ -589,7 +589,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-19 Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-19 (= ${binary:Version}) Conflicts: python3-lldb-x.y @@ -605,7 +605,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-19-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -933,7 +933,7 @@ Description: Post-link optimizer Package: flang-19 # no 32bit support # https://github.com/llvm/llvm-project/issues/59845 -Architecture: amd64 arm64 ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 +Architecture: amd64 arm64 ppc64el ppc64 sparc64 riscv64 loong64 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-19-dev (= ${binary:Version}), Provides: fortran-compiler, gfortran-mod-15 Description: Fortran compiler @@ -944,7 +944,7 @@ Description: Fortran compiler of examples, some functionalities are still missing. Package: libflang-19-dev -Architecture: amd64 arm64 ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 +Architecture: amd64 arm64 ppc64el ppc64 sparc64 riscv64 loong64 Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Description: Flang library - Development package diff --git a/debian/control.in b/debian/control.in index c907a1c4..fc4dfd4b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -525,7 +525,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -535,7 +535,7 @@ Description: LLVM-based linker Project. Package: liblld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -549,7 +549,7 @@ Description: LLVM-based linker, library Package: liblld-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-@LLVM_VERSION@ (= ${binary:Version}), liblld-@LLVM_VERSION@ (= ${binary:Version}), libzstd-dev, zlib1g-dev @@ -589,7 +589,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-@LLVM_VERSION@ Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version}) Conflicts: python3-lldb-x.y @@ -605,7 +605,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64 +Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} diff --git a/debian/patches/kfreebsd/CMakeLists.txt.diff b/debian/patches/kfreebsd/CMakeLists.txt.diff deleted file mode 100644 index 5f739bd1..00000000 --- a/debian/patches/kfreebsd/CMakeLists.txt.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/llvm/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/CMakeLists.txt -@@ -867,7 +867,7 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST) - # (this is a variable that CrossCompile sets on recursive invocations) - endif() - --if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") -+if( ${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)" AND NOT "kFreeBSD" ) - # On FreeBSD, /usr/local/* is not used by default. In order to build LLVM - # with libxml2, iconv.h, etc., we must add /usr/local paths. - include_directories(SYSTEM "/usr/local/include") diff --git a/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff b/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff deleted file mode 100644 index 1acf81d8..00000000 --- a/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff +++ /dev/null @@ -1,48 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Basic/Targets.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/clang/lib/Basic/Targets.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Basic/Targets.cpp -@@ -470,8 +470,8 @@ TargetInfo *AllocateTarget(const llvm::T - return new OpenBSDI386TargetInfo(Triple, Opts); - case llvm::Triple::FreeBSD: - return new FreeBSDTargetInfo(Triple, Opts); -- case llvm::Triple::KFreeBSD: -- return new KFreeBSDTargetInfo(Triple, Opts); -+ case llvm::Triple::kFreeBSD: -+ return new kFreeBSDTargetInfo(Triple, Opts); - case llvm::Triple::Minix: - return new MinixTargetInfo(Triple, Opts); - case llvm::Triple::Solaris: -@@ -529,8 +529,8 @@ TargetInfo *AllocateTarget(const llvm::T - return new FreeBSDTargetInfo(Triple, Opts); - case llvm::Triple::Fuchsia: - return new FuchsiaTargetInfo(Triple, Opts); -- case llvm::Triple::KFreeBSD: -- return new KFreeBSDTargetInfo(Triple, Opts); -+ case llvm::Triple::kFreeBSD: -+ return new kFreeBSDTargetInfo(Triple, Opts); - case llvm::Triple::Solaris: - return new SolarisTargetInfo(Triple, Opts); - case llvm::Triple::Win32: { -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Basic/Targets/OSTargets.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/clang/lib/Basic/Targets/OSTargets.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Basic/Targets/OSTargets.h -@@ -265,7 +265,7 @@ public: - - // GNU/kFreeBSD Target - template --class LLVM_LIBRARY_VISIBILITY KFreeBSDTargetInfo : public OSTargetInfo { -+class LLVM_LIBRARY_VISIBILITY kFreeBSDTargetInfo : public OSTargetInfo { - protected: - void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple, - MacroBuilder &Builder) const override { -@@ -282,7 +282,7 @@ protected: - } - - public: -- KFreeBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) -+ kFreeBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) - : OSTargetInfo(Triple, Opts) {} - }; - diff --git a/debian/patches/kfreebsd/compiler-rt_lib.diff b/debian/patches/kfreebsd/compiler-rt_lib.diff deleted file mode 100644 index 4f376484..00000000 --- a/debian/patches/kfreebsd/compiler-rt_lib.diff +++ /dev/null @@ -1,374 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp -@@ -83,9 +83,14 @@ - extern "C" { - // must be included after and on - // FreeBSD 9.2 and 10.0. -+#if SANITIZER_KFREEBSD -+#include -+#endif - #include - } -+#if !SANITIZER_KFREEBSD - #include -+#endif - #endif // SANITIZER_FREEBSD - - #if SANITIZER_NETBSD -@@ -461,10 +466,12 @@ bool FileExists(const char *filename) { - - #if !SANITIZER_NETBSD - tid_t GetTid() { --#if SANITIZER_FREEBSD -+#if SANITIZER_FREEBSD && !SANITIZER_KFREEBSD - long Tid; - thr_self(&Tid); - return Tid; -+#elif SANITIZER_KFREEBSD -+ return (uptr)pthread_self(); - #elif SANITIZER_OPENBSD - return internal_syscall(SYSCALL(getthrid)); - #elif SANITIZER_SOLARIS -@@ -1148,10 +1155,10 @@ bool LibraryNameIs(const char *full_name - // Call cb for each region mapped by map. - void ForEachMappedRegion(link_map *map, void (*cb)(const void *, uptr)) { - CHECK_NE(map, nullptr); --#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD -+#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD || SANITIZER_KFREEBSD - typedef ElfW(Phdr) Elf_Phdr; - typedef ElfW(Ehdr) Elf_Ehdr; --#endif // !SANITIZER_FREEBSD && !SANITIZER_OPENBSD -+#endif // !SANITIZER_FREEBSD && !SANITIZER_OPENBSD || SANITIZER_KFREEBSD - char *base = (char *)map->l_addr; - Elf_Ehdr *ehdr = (Elf_Ehdr *)base; - char *phdrs = base + ehdr->e_phoff; -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp -@@ -36,10 +36,12 @@ - #include - - #if SANITIZER_FREEBSD --#include -+# if !SANITIZER_KFREEBSD -+# include -+# define pthread_getattr_np pthread_attr_get_np -+# endif - #include - #include --#define pthread_getattr_np pthread_attr_get_np - #endif - - #if SANITIZER_OPENBSD -@@ -525,9 +527,9 @@ void GetThreadStackAndTls(bool main, upt - #endif - } - --#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD -+#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD || SANITIZER_KFREEBSD - typedef ElfW(Phdr) Elf_Phdr; --#elif SANITIZER_WORDSIZE == 32 && __FreeBSD_version <= 902001 // v9.2 -+#elif SANITIZER_WORDSIZE == 32 && !SANITIZER_KFREEBSD && __FreeBSD_version <= 902001 // v9.2 - #define Elf_Phdr XElf32_Phdr - #define dl_phdr_info xdl_phdr_info - #define dl_iterate_phdr(c, b) xdl_iterate_phdr((c), (b)) -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_platform.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_platform.h -@@ -15,7 +15,7 @@ - #if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \ - !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(_WIN32) && \ - !defined(__Fuchsia__) && !defined(__rtems__) && \ -- !(defined(__sun__) && defined(__svr4__)) -+ !(defined(__sun__) && defined(__svr4__)) && !defined(__FreeBSD_kernel__) - # error "This operating system is not supported" - #endif - -@@ -25,12 +25,18 @@ - # define SANITIZER_LINUX 0 - #endif - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - # define SANITIZER_FREEBSD 1 - #else - # define SANITIZER_FREEBSD 0 - #endif - -+#if defined(__FreeBSD_kernel__) -+# define SANITIZER_KFREEBSD 1 -+#else -+# define SANITIZER_KFREEBSD 0 -+#endif -+ - #if defined(__NetBSD__) - # define SANITIZER_NETBSD 1 - #else -@@ -112,7 +118,8 @@ - - #define SANITIZER_POSIX \ - (SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC || \ -- SANITIZER_NETBSD || SANITIZER_OPENBSD || SANITIZER_SOLARIS) -+ SANITIZER_NETBSD || SANITIZER_OPENBSD || SANITIZER_SOLARIS || \ -+ SANITIZER_KFREEBSD) - - #if __LP64__ || defined(_WIN64) - # define SANITIZER_WORDSIZE 64 -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/asan/asan_linux.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/asan/asan_linux.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/asan/asan_linux.cpp -@@ -37,7 +37,7 @@ - #include - #include - --#if SANITIZER_FREEBSD -+#if SANITIZER_FREEBSD && !SANITIZER_KFREEBSD - #include - #endif - -@@ -47,7 +47,11 @@ - - #if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS - #include -+#if SANITIZER_KFREEBSD -+#include -+#else - extern "C" void* _DYNAMIC; -+#endif - #elif SANITIZER_NETBSD - #include - #include -@@ -60,7 +64,7 @@ extern Elf_Dyn _DYNAMIC; - // x86-64 FreeBSD 9.2 and older define 'ucontext_t' incorrectly in - // 32-bit mode. - #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32) && \ -- __FreeBSD_version <= 902001 // v9.2 -+ !SANITIZER_KFREEBSD && __FreeBSD_version <= 902001 // v9.2 - #define ucontext_t xucontext_t - #endif - -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/ubsan/ubsan_platform.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/ubsan/ubsan_platform.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/ubsan/ubsan_platform.h -@@ -14,7 +14,7 @@ - - // Other platforms should be easy to add, and probably work as-is. - #if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || \ -- defined(__NetBSD__) || defined(__OpenBSD__) || \ -+ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || \ - (defined(__sun__) && defined(__svr4__)) || \ - defined(_WIN32) || defined(__Fuchsia__) || defined(__rtems__) - # define CAN_SANITIZE_UB 1 -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S -@@ -192,7 +192,7 @@ ASM_SYMBOL_INTERCEPTOR(setjmp): - // obtain SP, store in %rdi, first argument to `void __tsan_setjmp(uptr sp)` - #if defined(__FreeBSD__) || defined(__NetBSD__) - lea 8(%rsp), %rdi --#elif defined(__linux__) || defined(__APPLE__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) - lea 16(%rsp), %rdi - #else - # error "Unknown platform" -@@ -233,7 +233,7 @@ ASM_SYMBOL_INTERCEPTOR(_setjmp): - // obtain SP, store in %rdi, first argument to `void __tsan_setjmp(uptr sp)` - #if defined(__FreeBSD__) || defined(__NetBSD__) - lea 8(%rsp), %rdi --#elif defined(__linux__) || defined(__APPLE__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) - lea 16(%rsp), %rdi - #else - # error "Unknown platform" -@@ -281,7 +281,7 @@ ASM_SYMBOL_INTERCEPTOR(sigsetjmp): - // obtain SP, store in %rdi, first argument to `void __tsan_setjmp(uptr sp)` - #if defined(__FreeBSD__) || defined(__NetBSD__) - lea 24(%rsp), %rdi --#elif defined(__linux__) || defined(__APPLE__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) - lea 32(%rsp), %rdi - #else - # error "Unknown platform" -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerDefs.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerDefs.h -@@ -28,6 +28,7 @@ - #define LIBFUZZER_LINUX 1 - #define LIBFUZZER_NETBSD 0 - #define LIBFUZZER_FREEBSD 0 -+#define LIBFUZZER_KFREEBSD 1 - #define LIBFUZZER_OPENBSD 0 - #define LIBFUZZER_WINDOWS 0 - #elif __APPLE__ -@@ -54,6 +55,15 @@ - #define LIBFUZZER_FREEBSD 1 - #define LIBFUZZER_OPENBSD 0 - #define LIBFUZZER_WINDOWS 0 -+#elif __FreeBSD_kernel__ -+#define LIBFUZZER_APPLE 0 -+#define LIBFUZZER_FUCHSIA 0 -+#define LIBFUZZER_LINUX 0 -+#define LIBFUZZER_NETBSD 0 -+#define LIBFUZZER_FREEBSD 0 -+#define LIBFUZZER_KFREEBSD 1 -+#define LIBFUZZER_OPENBSD 0 -+#define LIBFUZZER_WINDOWS 0 - #elif __OpenBSD__ - #define LIBFUZZER_APPLE 0 - #define LIBFUZZER_FUCHSIA 0 -@@ -95,7 +105,7 @@ - - #define LIBFUZZER_POSIX \ - (LIBFUZZER_APPLE || LIBFUZZER_LINUX || LIBFUZZER_NETBSD || \ -- LIBFUZZER_FREEBSD || LIBFUZZER_OPENBSD) -+ LIBFUZZER_FREEBSD || LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD) - - #ifdef __x86_64 - # if __has_attribute(target) -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp -@@ -133,7 +133,7 @@ size_t GetPeakRSSMb() { - if (getrusage(RUSAGE_SELF, &usage)) - return 0; - if (LIBFUZZER_LINUX || LIBFUZZER_FREEBSD || LIBFUZZER_NETBSD || -- LIBFUZZER_OPENBSD) { -+ LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD) { - // ru_maxrss is in KiB - return usage.ru_maxrss >> 10; - } else if (LIBFUZZER_APPLE) { -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp -@@ -11,7 +11,7 @@ - #include "FuzzerDefs.h" - - #if LIBFUZZER_LINUX || LIBFUZZER_NETBSD || LIBFUZZER_FREEBSD || \ -- LIBFUZZER_OPENBSD -+ LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD - __attribute__((weak)) extern uint8_t __start___libfuzzer_extra_counters; - __attribute__((weak)) extern uint8_t __stop___libfuzzer_extra_counters; - -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp -@@ -13,7 +13,7 @@ - //===----------------------------------------------------------------------===// - #include "FuzzerDefs.h" - #if LIBFUZZER_LINUX || LIBFUZZER_NETBSD || LIBFUZZER_FUCHSIA || \ -- LIBFUZZER_FREEBSD || LIBFUZZER_OPENBSD -+ LIBFUZZER_FREEBSD || LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD - - #include "FuzzerExtFunctions.h" - #include "FuzzerIO.h" -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp -@@ -9,7 +9,7 @@ - //===----------------------------------------------------------------------===// - #include "FuzzerDefs.h" - #if LIBFUZZER_LINUX || LIBFUZZER_NETBSD || LIBFUZZER_FREEBSD || \ -- LIBFUZZER_OPENBSD -+ LIBFUZZER_OPENBSD || LIBFUZZER_KFREEBSD - #include "FuzzerCommand.h" - - #include -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h -@@ -20,7 +20,7 @@ - // 32-bit mode. - #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32) - # include --# if __FreeBSD_version <= 902001 // v9.2 -+# if !SANITIZER_KFREEBSD && __FreeBSD_version <= 902001 // v9.2 - # include - # include - # include -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cpp -@@ -37,7 +37,7 @@ - // Fix 'kinfo_vmentry' definition on FreeBSD prior v9.2 in 32-bit mode. - #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32) - #include --#if __FreeBSD_version <= 902001 // v9.2 -+#if !SANITIZER_KFREEBSD && __FreeBSD_version <= 902001 // v9.2 - #define kinfo_vmentry xkinfo_vmentry - #endif - #endif -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -24,7 +24,9 @@ - #include "sanitizer_glibc_version.h" - #endif - -+#if !SANITIZER_KFREEBSD - # define GET_LINK_MAP_BY_DLOPEN_HANDLE(handle) ((link_map*)(handle)) -+#endif - - namespace __sanitizer { - extern unsigned struct_utsname_sz; -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc -@@ -19,7 +19,7 @@ - # define SYSCALL(name) __NR_ ## name - #endif - --#if defined(__x86_64__) && (SANITIZER_FREEBSD || SANITIZER_MAC) -+#if defined(__x86_64__) && ((SANITIZER_FREEBSD && !SANITIZER_KFREEBSD) || SANITIZER_MAC) - # define internal_syscall __syscall - # else - # define internal_syscall syscall -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -109,10 +109,14 @@ typedef struct user_fpregs elf_fpregset_ - #include - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_KFREEBSD - #include - #include -+#if SANITIZER_KFREEBSD -+#include -+#else - #include -+#endif - #include - #include - #include -@@ -150,8 +154,12 @@ typedef struct user_fpregs elf_fpregset_ - #include - #endif - --#if SANITIZER_LINUX -+#if SANITIZER_LINUX || SANITIZER_KFREEBSD -+#if SANITIZER_KFREEBSD -+#include -+#else - #include -+#endif - #include - #include - #include diff --git a/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff b/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff deleted file mode 100644 index 7fa4a854..00000000 --- a/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff +++ /dev/null @@ -1,33 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/include/llvm/ADT/Triple.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/llvm/include/llvm/ADT/Triple.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/include/llvm/ADT/Triple.h -@@ -161,7 +161,7 @@ public: - FreeBSD, - Fuchsia, - IOS, -- KFreeBSD, -+ kFreeBSD, - Linux, - Lv2, // PS3 - MacOSX, -@@ -588,8 +588,8 @@ public: - } - - /// Tests whether the OS is kFreeBSD. -- bool isOSKFreeBSD() const { -- return getOS() == Triple::KFreeBSD; -+ bool isOSkFreeBSD() const { -+ return getOS() == Triple::kFreeBSD; - } - - /// Tests whether the OS is Hurd. -@@ -609,7 +609,7 @@ public: - - /// Tests whether the OS uses glibc. - bool isOSGlibc() const { -- return (getOS() == Triple::Linux || getOS() == Triple::KFreeBSD || -+ return (getOS() == Triple::Linux || getOS() == Triple::kFreeBSD || - getOS() == Triple::Hurd) && - !isAndroid(); - } diff --git a/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff b/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff deleted file mode 100644 index 54c92e15..00000000 --- a/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxx/include/__config -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/libcxx/include/__config -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxx/include/__config -@@ -1085,6 +1085,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit - !defined(_LIBCPP_HAS_THREAD_API_WIN32) && \ - !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL) - # if defined(__FreeBSD__) || \ -+ defined(__FreeBSD_kernel__) || \ - defined(__Fuchsia__) || \ - defined(__wasi__) || \ - defined(__NetBSD__) || \ diff --git a/debian/patches/kfreebsd/kfreebsd-openmp.diff b/debian/patches/kfreebsd/kfreebsd-openmp.diff deleted file mode 100644 index ba53484d..00000000 --- a/debian/patches/kfreebsd/kfreebsd-openmp.diff +++ /dev/null @@ -1,129 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/kmp.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/openmp/runtime/src/kmp.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/kmp.h -@@ -1142,6 +1142,10 @@ extern kmp_uint64 __kmp_now_nsec(); - /* TODO: tune for KMP_OS_OPENBSD */ - #define KMP_INIT_WAIT 1024U /* initial number of spin-tests */ - #define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */ -+#elif KMP_OS_KFREEBSD -+/* TODO: tune for KMP_OS_KFREEBSD */ -+#define KMP_INIT_WAIT 1024U /* initial number of spin-tests */ -+#define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */ - #endif - - #if KMP_ARCH_X86 || KMP_ARCH_X86_64 -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/kmp_ftn_entry.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/openmp/runtime/src/kmp_ftn_entry.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/kmp_ftn_entry.h -@@ -531,7 +531,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_ - int gtid; - - #if KMP_OS_DARWIN || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \ -- KMP_OS_HURD -+ KMP_OS_HURD || KMP_OS_KFREEBSD - gtid = __kmp_entry_gtid(); - #elif KMP_OS_WINDOWS - if (!__kmp_init_parallel || -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/kmp_platform.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/openmp/runtime/src/kmp_platform.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/kmp_platform.h -@@ -18,6 +18,7 @@ - #define KMP_OS_LINUX 0 - #define KMP_OS_DRAGONFLY 0 - #define KMP_OS_FREEBSD 0 -+#define KMP_OS_KFREEBSD 0 - #define KMP_OS_NETBSD 0 - #define KMP_OS_OPENBSD 0 - #define KMP_OS_DARWIN 0 -@@ -56,6 +57,11 @@ - #define KMP_OS_FREEBSD 1 - #endif - -+#if (defined __FreeBSD_kernel__) -+#undef KMP_OS_KFREEBSD -+#define KMP_OS_KFREEBSD 1 -+#endif -+ - #if (defined __NetBSD__) - #undef KMP_OS_NETBSD - #define KMP_OS_NETBSD 1 -@@ -78,12 +84,12 @@ - - #if (1 != \ - KMP_OS_LINUX + KMP_OS_DRAGONFLY + KMP_OS_FREEBSD + KMP_OS_NETBSD + \ -- KMP_OS_OPENBSD + KMP_OS_DARWIN + KMP_OS_WINDOWS + KMP_OS_HURD) -+ KMP_OS_OPENBSD + KMP_OS_DARWIN + KMP_OS_WINDOWS + KMP_OS_HURD + KMP_OS_KFREEBSD) - #error Unknown OS - #endif - - #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \ -- KMP_OS_OPENBSD || KMP_OS_DARWIN || KMP_OS_HURD -+ KMP_OS_OPENBSD || KMP_OS_DARWIN || KMP_OS_HURD || KMP_OS_KFREEBSD - #undef KMP_OS_UNIX - #define KMP_OS_UNIX 1 - #endif -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/kmp_runtime.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/openmp/runtime/src/kmp_runtime.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/kmp_runtime.cpp -@@ -8114,7 +8114,7 @@ __kmp_determine_reduction_method( - KMP_ARCH_MIPS64 || KMP_ARCH_RISCV64 - - #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \ -- KMP_OS_OPENBSD || KMP_OS_WINDOWS || KMP_OS_DARWIN || KMP_OS_HURD -+ KMP_OS_OPENBSD || KMP_OS_WINDOWS || KMP_OS_DARWIN || KMP_OS_HURD || KMP_OS_KFREEBSD - - int teamsize_cutoff = 4; - -@@ -8142,7 +8142,7 @@ __kmp_determine_reduction_method( - - #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS - --#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS || KMP_OS_HURD -+#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS || KMP_OS_HURD || KMP_OS_KFREEBSD - - // basic tuning - -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/z_Linux_util.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/openmp/runtime/src/z_Linux_util.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/openmp/runtime/src/z_Linux_util.cpp -@@ -472,7 +472,7 @@ void __kmp_terminate_thread(int gtid) { - static kmp_int32 __kmp_set_stack_info(int gtid, kmp_info_t *th) { - int stack_data; - #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \ -- KMP_OS_HURD -+ KMP_OS_HURD || KMP_OS_KFREEBSD - pthread_attr_t attr; - int status; - size_t size = 0; -@@ -526,7 +526,7 @@ static void *__kmp_launch_worker(void *t - #endif /* KMP_BLOCK_SIGNALS */ - void *exit_val; - #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \ -- KMP_OS_OPENBSD || KMP_OS_HURD -+ KMP_OS_OPENBSD || KMP_OS_HURD || KMP_OS_KFREEBSD - void *volatile padding = 0; - #endif - int gtid; -@@ -1798,7 +1798,7 @@ static int __kmp_get_xproc(void) { - int r = 0; - - #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \ -- KMP_OS_OPENBSD || KMP_OS_HURD -+ KMP_OS_OPENBSD || KMP_OS_HURD || KMP_OS_KFREEBSD - - r = sysconf(_SC_NPROCESSORS_ONLN); - -@@ -2042,7 +2042,7 @@ int __kmp_is_address_mapped(void *addr) - // Free resources. - fclose(file); - KMP_INTERNAL_FREE(name); --#elif KMP_OS_FREEBSD -+#elif KMP_OS_FREEBSD || KMP_OS_KFREEBSD - char *buf; - size_t lstsz; - int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid()}; diff --git a/debian/patches/kfreebsd/kfreebsd-threads-build.diff b/debian/patches/kfreebsd/kfreebsd-threads-build.diff deleted file mode 100644 index 4601629b..00000000 --- a/debian/patches/kfreebsd/kfreebsd-threads-build.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxx/src/thread.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/libcxx/src/thread.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxx/src/thread.cpp -@@ -18,7 +18,7 @@ - - #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) - # include --# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) || defined(__FreeBSD_kernel__) - # include - # endif - #endif // defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) diff --git a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff deleted file mode 100644 index f8de7bf5..00000000 --- a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff +++ /dev/null @@ -1,615 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/clang/lib/Driver/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/CMakeLists.txt -@@ -49,6 +49,7 @@ add_clang_library(clangDriver - ToolChains/HIP.cpp - ToolChains/Hexagon.cpp - ToolChains/Hurd.cpp -+ ToolChains/KFreeBSD.cpp - ToolChains/Linux.cpp - ToolChains/MipsLinux.cpp - ToolChains/MinGW.cpp -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/Driver.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/clang/lib/Driver/Driver.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/Driver.cpp -@@ -26,6 +26,7 @@ - #include "ToolChains/Haiku.h" - #include "ToolChains/Hexagon.h" - #include "ToolChains/Hurd.h" -+#include "ToolChains/KFreeBSD.h" - #include "ToolChains/Lanai.h" - #include "ToolChains/Linux.h" - #include "ToolChains/MSP430.h" -@@ -4727,6 +4728,9 @@ const ToolChain &Driver::getToolChain(co - case llvm::Triple::FreeBSD: - TC = std::make_unique(*this, Target, Args); - break; -+ case llvm::Triple::kFreeBSD: -+ TC = std::make_unique(*this, Target, Args); -+ break; - case llvm::Triple::Minix: - TC = std::make_unique(*this, Target, Args); - break; -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/Clang.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/clang/lib/Driver/ToolChains/Clang.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/Clang.cpp -@@ -453,7 +453,7 @@ static bool useFramePointerForTargetByDe - } - - if (Triple.isOSLinux() || Triple.getOS() == llvm::Triple::CloudABI || -- Triple.isOSHurd()) { -+ Triple.isOSHurd() || Triple.isOSkFreeBSD()) { - switch (Triple.getArch()) { - // Don't use a frame pointer on linux if optimizing for certain targets. - case llvm::Triple::mips64: -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/Gnu.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/clang/lib/Driver/ToolChains/Gnu.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/Gnu.cpp -@@ -578,6 +578,20 @@ void tools::gnutools::Linker::ConstructJ - - if (!Args.hasArg(options::OPT_nolibc)) - CmdArgs.push_back("-lc"); -+ CmdArgs.push_back("-lc"); -+ -+ if (getToolChain().getTriple().isOSkFreeBSD()) { -+ switch (getToolChain().getArch()) { -+ case llvm::Triple::x86_64: -+ CmdArgs.push_back("-rpath-link=/lib/x86_64-kfreebsd-gnu"); -+ break; -+ case llvm::Triple::x86: -+ CmdArgs.push_back("-rpath-link=/lib/i386-kfreebsd-gnu"); -+ break; -+ default: -+ break; -+ } -+ } - - // Add IAMCU specific libs, if needed. - if (IsIAMCU) -@@ -1957,7 +1971,8 @@ void Generic_GCC::GCCInstallationDetecto - "x86_64-redhat-linux", "x86_64-suse-linux", - "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", - "x86_64-slackware-linux", "x86_64-unknown-linux", -- "x86_64-amazon-linux", "x86_64-linux-android"}; -+ "x86_64-amazon-linux", "x86_64-linux-android", -+ "x86_64-kfreebsd-gnu", "x86_64-pc-kfreebsd-gnu"}; - static const char *const X32LibDirs[] = {"/libx32"}; - static const char *const X86LibDirs[] = {"/lib32", "/lib"}; - static const char *const X86Triples[] = { -@@ -1966,7 +1981,9 @@ void Generic_GCC::GCCInstallationDetecto - "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux", - "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu", - "i686-linux-android", "i386-gnu", "i486-gnu", -- "i586-gnu", "i686-gnu"}; -+ "i586-gnu", "i686-gnu", -+ "i686-kfreebsd-gnu", "i686-pc-kfreebsd-gnu", "i486-kfreebsd-gnu", -+ "i386-kfreebsd-gnu" }; - - static const char *const MIPSLibDirs[] = {"/lib"}; - static const char *const MIPSTriples[] = { -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/KFreeBSD.cpp -=================================================================== ---- /dev/null -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/KFreeBSD.cpp -@@ -0,0 +1,458 @@ -+//===--- KFreeBSD.cpp - kFreeBSD ToolChain Implementations --------*- C++ -*-===// -+// -+// The LLVM Compiler Infrastructure -+// -+// This file is distributed under the University of Illinois Open Source -+// License. See LICENSE.TXT for details. -+// -+//===----------------------------------------------------------------------===// -+ -+#include "KFreeBSD.h" -+#include "CommonArgs.h" -+#include "llvm/Support/VirtualFileSystem.h" -+#include "clang/Config/config.h" -+#include "clang/Driver/Driver.h" -+#include "clang/Driver/Options.h" -+#include "clang/Driver/SanitizerArgs.h" -+#include "llvm/Option/ArgList.h" -+#include "llvm/ProfileData/InstrProf.h" -+#include "llvm/Support/Path.h" -+ -+using namespace clang::driver; -+using namespace clang::driver::toolchains; -+using namespace clang; -+using namespace llvm::opt; -+ -+using tools::addPathIfExists; -+ -+/// Get our best guess at the multiarch triple for a target. -+/// -+/// Debian-based systems are starting to use a multiarch setup where they use -+/// a target-triple directory in the library and header search paths. -+/// Unfortunately, this triple does not align with the vanilla target triple, -+/// so we provide a rough mapping here. -+static std::string getMultiarchTriple(const Driver &D, -+ const llvm::Triple &TargetTriple, -+ StringRef SysRoot) { -+ // For most architectures, just use whatever we have rather than trying to be -+ // clever. -+ switch (TargetTriple.getArch()) { -+ default: -+ break; -+ -+ // We use the existence of '/lib/' as a directory to detect -+ // some common kfreebsd triples that don't quite match the Clang -+ // triple for both 32-bit and 64-bit targets. Multiarch fixes its -+ // install triples to these regardless of what the actual target -+ // triple is. -+ case llvm::Triple::x86_64: -+ if (D.getVFS().exists(SysRoot + "/lib/x86_64-kfreebsd-gnu")) -+ return "x86_64-kfreebsd-gnu"; -+ break; -+ case llvm::Triple::x86: -+ if (D.getVFS().exists(SysRoot + "/lib/i386-kfreebsd-gnu")) -+ return "i386-kfreebsd-gnu"; -+ break; -+ } -+ -+ return TargetTriple.str(); -+} -+ -+static StringRef getOSLibDir(const llvm::Triple &Triple, const ArgList &Args) { -+ // It happens that only x86 and PPC use the 'lib32' variant of oslibdir, and -+ // using that variant while targeting other architectures causes problems -+ // because the libraries are laid out in shared system roots that can't cope -+ // with a 'lib32' library search path being considered. So we only enable -+ // them when we know we may need it. -+ // -+ // FIXME: This is a bit of a hack. We should really unify this code for -+ // reasoning about oslibdir spellings with the lib dir spellings in the -+ // GCCInstallationDetector, but that is a more significant refactoring. -+ -+ if (Triple.getArch() == llvm::Triple::x86) -+ return "lib"; -+ -+ if (Triple.getArch() == llvm::Triple::x86_64) -+ return "lib"; -+ -+ return Triple.isArch32Bit() ? "lib" : "lib64"; -+} -+ -+static void addMultilibsFilePaths(const Driver &D, const MultilibSet &Multilibs, -+ const Multilib &Multilib, -+ StringRef InstallPath, -+ ToolChain::path_list &Paths) { -+ if (const auto &PathsCallback = Multilibs.filePathsCallback()) -+ for (const auto &Path : PathsCallback(Multilib)) -+ addPathIfExists(D, InstallPath + Path, Paths); -+} -+ -+kFreeBSD::kFreeBSD(const Driver &D, const llvm::Triple &Triple, -+ const ArgList &Args) -+ : Generic_ELF(D, Triple, Args) { -+ GCCInstallation.init(Triple, Args); -+ Multilibs = GCCInstallation.getMultilibs(); -+ std::string SysRoot = computeSysRoot(); -+ -+ // Cross-compiling binutils and GCC installations (vanilla and openSUSE at -+ // least) put various tools in a triple-prefixed directory off of the parent -+ // of the GCC installation. We use the GCC triple here to ensure that we end -+ // up with tools that support the same amount of cross compiling as the -+ // detected GCC installation. For example, if we find a GCC installation -+ // targeting x86_64, but it is a bi-arch GCC installation, it can also be -+ // used to target i386. -+ // FIXME: This seems unlikely to be Linux-, kFreeBSD- or Hurd-specific. -+ ToolChain::path_list &PPaths = getProgramPaths(); -+ PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + -+ GCCInstallation.getTriple().str() + "/bin") -+ .str()); -+ -+#ifdef ENABLE_LINKER_BUILD_ID -+ ExtraOpts.push_back("--build-id"); -+#endif -+ -+ // The selection of paths to try here is designed to match the patterns which -+ // the GCC driver itself uses, as this is part of the GCC-compatible driver. -+ // This was determined by running GCC in a fake filesystem, creating all -+ // possible permutations of these directories, and seeing which ones it added -+ // to the link paths. -+ path_list &Paths = getFilePaths(); -+ -+ const std::string OSLibDir = getOSLibDir(Triple, Args); -+ const std::string MultiarchTriple = getMultiarchTriple(D, Triple, SysRoot); -+ -+ // Add the multilib suffixed paths where they are available. -+ if (GCCInstallation.isValid()) { -+ const llvm::Triple &GCCTriple = GCCInstallation.getTriple(); -+ const std::string &LibPath = GCCInstallation.getParentLibPath(); -+ const Multilib &Multilib = GCCInstallation.getMultilib(); -+ const MultilibSet &Multilibs = GCCInstallation.getMultilibs(); -+ -+ // Add toolchain / multilib specific file paths. -+ addMultilibsFilePaths(D, Multilibs, Multilib, -+ GCCInstallation.getInstallPath(), Paths); -+ -+ // Sourcery CodeBench MIPS toolchain holds some libraries under -+ // a biarch-like suffix of the GCC installation. -+ addPathIfExists(D, GCCInstallation.getInstallPath() + Multilib.gccSuffix(), -+ Paths); -+ -+ // GCC cross compiling toolchains will install target libraries which ship -+ // as part of the toolchain under // rather than as -+ // any part of the GCC installation in -+ // //gcc//. This decision is somewhat -+ // debatable, but is the reality today. We need to search this tree even -+ // when we have a sysroot somewhere else. It is the responsibility of -+ // whomever is doing the cross build targeting a sysroot using a GCC -+ // installation that is *not* within the system root to ensure two things: -+ // -+ // 1) Any DSOs that are linked in from this tree or from the install path -+ // above must be present on the system root and found via an -+ // appropriate rpath. -+ // 2) There must not be libraries installed into -+ // // unless they should be preferred over -+ // those within the system root. -+ // -+ // Note that this matches the GCC behavior. See the below comment for where -+ // Clang diverges from GCC's behavior. -+ addPathIfExists(D, LibPath + "/../" + GCCTriple.str() + "/lib/../" + -+ OSLibDir + Multilib.osSuffix(), -+ Paths); -+ -+ // If the GCC installation we found is inside of the sysroot, we want to -+ // prefer libraries installed in the parent prefix of the GCC installation. -+ // It is important to *not* use these paths when the GCC installation is -+ // outside of the system root as that can pick up unintended libraries. -+ // This usually happens when there is an external cross compiler on the -+ // host system, and a more minimal sysroot available that is the target of -+ // the cross. Note that GCC does include some of these directories in some -+ // configurations but this seems somewhere between questionable and simply -+ // a bug. -+ if (StringRef(LibPath).starts_with(SysRoot)) { -+ addPathIfExists(D, LibPath + "/" + MultiarchTriple, Paths); -+ addPathIfExists(D, LibPath + "/../" + OSLibDir, Paths); -+ } -+ } -+ -+ // Similar to the logic for GCC above, if we currently running Clang inside -+ // of the requested system root, add its parent library paths to -+ // those searched. -+ // FIXME: It's not clear whether we should use the driver's installed -+ // directory ('Dir' below) or the ResourceDir. -+ if (StringRef(D.Dir).starts_with(SysRoot)) { -+ addPathIfExists(D, D.Dir + "/../lib/" + MultiarchTriple, Paths); -+ addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths); -+ } -+ -+ addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths); -+ addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths); -+ -+ addPathIfExists(D, SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -+ addPathIfExists(D, SysRoot + "/usr/lib/../" + OSLibDir, Paths); -+ -+ // Try walking via the GCC triple path in case of biarch or multiarch GCC -+ // installations with strange symlinks. -+ if (GCCInstallation.isValid()) { -+ addPathIfExists(D, -+ SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -+ "/../../" + OSLibDir, -+ Paths); -+ -+ // Add the 'other' biarch variant path -+ Multilib BiarchSibling; -+ if (GCCInstallation.getBiarchSibling(BiarchSibling)) { -+ addPathIfExists(D, GCCInstallation.getInstallPath() + -+ BiarchSibling.gccSuffix(), -+ Paths); -+ } -+ -+ // See comments above on the multilib variant for details of why this is -+ // included even from outside the sysroot. -+ const std::string &LibPath = GCCInstallation.getParentLibPath(); -+ const llvm::Triple &GCCTriple = GCCInstallation.getTriple(); -+ const Multilib &Multilib = GCCInstallation.getMultilib(); -+ addPathIfExists(D, LibPath + "/../" + GCCTriple.str() + "/lib" + -+ Multilib.osSuffix(), -+ Paths); -+ -+ // See comments above on the multilib variant for details of why this is -+ // only included from within the sysroot. -+ if (StringRef(LibPath).starts_with(SysRoot)) -+ addPathIfExists(D, LibPath, Paths); -+ } -+ -+ // Similar to the logic for GCC above, if we are currently running Clang -+ // inside of the requested system root, add its parent library path to those -+ // searched. -+ // FIXME: It's not clear whether we should use the driver's installed -+ // directory ('Dir' below) or the ResourceDir. -+ if (StringRef(D.Dir).starts_with(SysRoot)) -+ addPathIfExists(D, D.Dir + "/../lib", Paths); -+ -+ addPathIfExists(D, SysRoot + "/lib", Paths); -+ addPathIfExists(D, SysRoot + "/usr/lib", Paths); -+} -+ -+bool kFreeBSD::HasNativeLLVMSupport() const { return true; } -+ -+Tool *kFreeBSD::buildLinker() const { return new tools::gnutools::Linker(*this); } -+ -+Tool *kFreeBSD::buildAssembler() const { -+ return new tools::gnutools::Assembler(*this); -+} -+ -+std::string kFreeBSD::computeSysRoot() const { -+ if (!getDriver().SysRoot.empty()) -+ return getDriver().SysRoot; -+ -+ return std::string(); -+} -+ -+std::string kFreeBSD::getDynamicLinker(const ArgList &Args) const { -+ const llvm::Triple::ArchType Arch = getArch(); -+ -+ if (Arch == llvm::Triple::x86_64) -+ return "/lib/ld-kfreebsd-x86-64.so.1"; -+ -+ if (Arch == llvm::Triple::x86) -+ return "/lib/ld.so.1"; -+ -+ llvm_unreachable("unsupported architecture"); -+} -+ -+void kFreeBSD::AddClangSystemIncludeArgs(const ArgList &DriverArgs, -+ ArgStringList &CC1Args) const { -+ const Driver &D = getDriver(); -+ std::string SysRoot = computeSysRoot(); -+ -+ if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc)) -+ return; -+ -+ if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -+ addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include"); -+ -+ if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { -+ SmallString<128> P(D.ResourceDir); -+ llvm::sys::path::append(P, "include"); -+ addSystemInclude(DriverArgs, CC1Args, P); -+ } -+ -+ if (DriverArgs.hasArg(options::OPT_nostdlibinc)) -+ return; -+ -+ // Check for configure-time C include directories. -+ StringRef CIncludeDirs(C_INCLUDE_DIRS); -+ if (CIncludeDirs != "") { -+ SmallVector dirs; -+ CIncludeDirs.split(dirs, ":"); -+ for (StringRef dir : dirs) { -+ StringRef Prefix = -+ llvm::sys::path::is_absolute(dir) ? StringRef(SysRoot) : ""; -+ addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir); -+ } -+ // addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include"); -+ return; -+ } -+ -+ // Lacking those, try to detect the correct set of system includes for the -+ // target triple. -+ -+ // Add include directories specific to the selected multilib set and multilib. -+ if (GCCInstallation.isValid()) { -+ const auto &Callback = Multilibs.includeDirsCallback(); -+ if (Callback) { -+ for (const auto &Path : Callback(GCCInstallation.getMultilib())) -+ addExternCSystemIncludeIfExists( -+ DriverArgs, CC1Args, GCCInstallation.getInstallPath() + Path); -+ } -+ } -+ -+ // Implement generic Debian multiarch support. -+ const StringRef X86_64MultiarchIncludeDirs[] = { -+ "/usr/include/x86_64-kfreebsd-gnu"}; -+ -+ // CHECK -+ const StringRef X86MultiarchIncludeDirs[] = { -+ "/usr/include/i386-kfreebsd-gnu"}; -+ -+ ArrayRef MultiarchIncludeDirs; -+ switch (getTriple().getArch()) { -+ case llvm::Triple::x86: -+ MultiarchIncludeDirs = X86MultiarchIncludeDirs; -+ break; -+ case llvm::Triple::x86_64: -+ MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; -+ break; -+ default: -+ break; -+ } -+ -+ for (StringRef Dir : MultiarchIncludeDirs) { -+ if (D.getVFS().exists(SysRoot + Dir)) { -+ addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + Dir); -+ break; -+ } -+ } -+ -+ // Add an include of '/include' directly. This isn't provided by default by -+ // system GCCs, but is often used with cross-compiling GCCs, and harmless to -+ // add even when Clang is acting as-if it were a system compiler. -+ addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include"); -+ -+ addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include"); -+} -+ -+static std::string DetectLibcxxIncludePath(StringRef base) { -+ std::error_code EC; -+ int MaxVersion = 0; -+ std::string MaxVersionString = ""; -+ for (llvm::sys::fs::directory_iterator LI(base, EC), LE; !EC && LI != LE; -+ LI = LI.increment(EC)) { -+ StringRef VersionText = llvm::sys::path::filename(LI->path()); -+ int Version; -+ if (VersionText[0] == 'v' && -+ !VersionText.slice(1, StringRef::npos).getAsInteger(10, Version)) { -+ if (Version > MaxVersion) { -+ MaxVersion = Version; -+ MaxVersionString = VersionText; -+ } -+ } -+ } -+ return MaxVersion ? (base + "/" + MaxVersionString).str() : ""; -+} -+ -+void kFreeBSD::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const { -+ const std::string& SysRoot = computeSysRoot(); -+ const std::string LibCXXIncludePathCandidates[] = { -+ DetectLibcxxIncludePath(getDriver().ResourceDir + "/include/c++"), -+ DetectLibcxxIncludePath(getDriver().Dir + "/../include/c++"), -+ // If this is a development, non-installed, clang, libcxx will -+ // not be found at ../include/c++ but it likely to be found at -+ // one of the following two locations: -+ DetectLibcxxIncludePath(SysRoot + "/usr/local/include/c++"), -+ DetectLibcxxIncludePath(SysRoot + "/usr/include/c++") }; -+ for (const auto &IncludePath : LibCXXIncludePathCandidates) { -+ if (IncludePath.empty() || !getVFS().exists(IncludePath)) -+ continue; -+ // Use the first candidate that exists. -+ addSystemInclude(DriverArgs, CC1Args, IncludePath); -+ return; -+ } -+} -+ -+void kFreeBSD::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const { -+ // We need a detected GCC installation on kFreeBSD to provide libstdc++'s -+ // headers. -+ if (!GCCInstallation.isValid()) -+ return; -+ -+ // By default, look for the C++ headers in an include directory adjacent to -+ // the lib directory of the GCC installation. Note that this is expect to be -+ // equivalent to '/usr/include/c++/X.Y' in almost all cases. -+ StringRef LibDir = GCCInstallation.getParentLibPath(); -+ StringRef InstallDir = GCCInstallation.getInstallPath(); -+ StringRef TripleStr = GCCInstallation.getTriple().str(); -+ const Multilib &Multilib = GCCInstallation.getMultilib(); -+ const std::string GCCMultiarchTriple = getMultiarchTriple( -+ getDriver(), GCCInstallation.getTriple(), getDriver().SysRoot); -+ const std::string TargetMultiarchTriple = -+ getMultiarchTriple(getDriver(), getTriple(), getDriver().SysRoot); -+ const GCCVersion &Version = GCCInstallation.getVersion(); -+ -+ // The primary search for libstdc++ supports multiarch variants. -+ if (addLibStdCXXIncludePaths(LibDir.str() + "/../include", -+ "/c++/" + Version.Text, TripleStr, -+ GCCMultiarchTriple, TargetMultiarchTriple, -+ Multilib.includeSuffix(), DriverArgs, CC1Args)) -+ return; -+ -+ // Otherwise, fall back on a bunch of options which don't use multiarch -+ // layouts for simplicity. -+ const std::string LibStdCXXIncludePathCandidates[] = { -+ // Gentoo is weird and places its headers inside the GCC install, -+ // so if the first attempt to find the headers fails, try these patterns. -+ InstallDir.str() + "/include/g++-v" + Version.Text, -+ InstallDir.str() + "/include/g++-v" + Version.MajorStr + "." + -+ Version.MinorStr, -+ InstallDir.str() + "/include/g++-v" + Version.MajorStr, -+ // Android standalone toolchain has C++ headers in yet another place. -+ LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.Text, -+ // Freescale SDK C++ headers are directly in /usr/include/c++, -+ // without a subdirectory corresponding to the gcc version. -+ LibDir.str() + "/../include/c++", -+ }; -+ -+ for (const auto &IncludePath : LibStdCXXIncludePathCandidates) { -+ if (addLibStdCXXIncludePaths(IncludePath, /*Suffix*/ "", TripleStr, -+ /*GCCMultiarchTriple*/ "", -+ /*TargetMultiarchTriple*/ "", -+ Multilib.includeSuffix(), DriverArgs, CC1Args)) -+ break; -+ } -+} -+ -+/* FIXME: -+/home/srs/DEBs/llvm-toolchain-7/llvm-toolchain-7-7.0.1~+rc2-7/clang/lib/Driver/ToolChains/KFreeBSD.cpp:431:15: error: no declaration matches ‘clang::SanitizerMask clang::driver::toolchains::kFreeBSD::getSupportedSanitizers() const’ -+ SanitizerMask kFreeBSD::getSupportedSanitizers() const { -+*/ -+SanitizerMask kFreeBSD::getSupportedSanitizers() const { -+ const bool IsX86 = getTriple().getArch() == llvm::Triple::x86; -+ const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64; -+ SanitizerMask Res = ToolChain::getSupportedSanitizers(); -+ // FIXME: Add here!! -+ if (IsX86_64) { -+ Res |= SanitizerKind::DataFlow; -+ Res |= SanitizerKind::Leak; -+ Res |= SanitizerKind::Thread; -+ Res |= SanitizerKind::Scudo; -+ Res |= SanitizerKind::HWAddress; -+ Res |= SanitizerKind::KernelHWAddress; -+ } -+ if (IsX86 || IsX86_64) -+ Res |= SanitizerKind::Function; -+ -+ return Res; -+} -+ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/KFreeBSD.h -=================================================================== ---- /dev/null -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/KFreeBSD.h -@@ -0,0 +1,54 @@ -+//===--- KFreeBSD.h - kFreeBSD ToolChain Implementations ----------*- C++ -*-===// -+// -+// The LLVM Compiler Infrastructure -+// -+// This file is distributed under the University of Illinois Open Source -+// License. See LICENSE.TXT for details. -+// -+//===----------------------------------------------------------------------===// -+ -+#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_KFreeBSD_H -+#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_KFreeBSD_H -+ -+#include "Gnu.h" -+#include "clang/Driver/ToolChain.h" -+ -+namespace clang { -+namespace driver { -+namespace toolchains { -+ -+class LLVM_LIBRARY_VISIBILITY kFreeBSD : public Generic_ELF { -+public: -+ kFreeBSD(const Driver &D, const llvm::Triple &Triple, -+ const llvm::opt::ArgList &Args); -+ -+ bool HasNativeLLVMSupport() const override; -+ -+ void -+ AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const override; -+ void addLibCxxIncludePaths( -+ const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const override; -+ void addLibStdCxxIncludePaths( -+ const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const override; -+ -+ SanitizerMask getSupportedSanitizers() const override; -+ -+ virtual std::string computeSysRoot() const; -+ -+ virtual std::string getDynamicLinker(const llvm::opt::ArgList &Args) const; -+ -+ std::vector ExtraOpts; -+ -+protected: -+ Tool *buildAssembler() const override; -+ Tool *buildLinker() const override; -+}; -+ -+} // end namespace toolchains -+} // end namespace driver -+} // end namespace clang -+ -+#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_KFreeBSD_H diff --git a/debian/patches/kfreebsd/kfreebsd-triple.diff b/debian/patches/kfreebsd/kfreebsd-triple.diff deleted file mode 100644 index 50dd3f8a..00000000 --- a/debian/patches/kfreebsd/kfreebsd-triple.diff +++ /dev/null @@ -1,23 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/unittests/ADT/TripleTest.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/llvm/unittests/ADT/TripleTest.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/unittests/ADT/TripleTest.cpp -@@ -98,6 +98,18 @@ TEST(TripleTest, ParsedIDs) { - EXPECT_EQ(Triple::Hurd, T.getOS()); - EXPECT_EQ(Triple::GNU, T.getEnvironment()); - -+ T = Triple("i386-pc-kfreebsd-gnu"); -+ EXPECT_EQ(Triple::x86, T.getArch()); -+ EXPECT_EQ(Triple::PC, T.getVendor()); -+ EXPECT_EQ(Triple::kFreeBSD, T.getOS()); -+ EXPECT_EQ(Triple::GNU, T.getEnvironment()); -+ -+ T = Triple("x86_64-pc-kfreebsd-gnu"); -+ EXPECT_EQ(Triple::x86_64, T.getArch()); -+ EXPECT_EQ(Triple::PC, T.getVendor()); -+ EXPECT_EQ(Triple::kFreeBSD, T.getOS()); -+ EXPECT_EQ(Triple::GNU, T.getEnvironment()); -+ - T = Triple("x86_64-pc-linux-gnu"); - EXPECT_EQ(Triple::x86_64, T.getArch()); - EXPECT_EQ(Triple::PC, T.getVendor()); diff --git a/debian/patches/kfreebsd/lib_Support.diff b/debian/patches/kfreebsd/lib_Support.diff deleted file mode 100644 index c27fb302..00000000 --- a/debian/patches/kfreebsd/lib_Support.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/lib/Support/Triple.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/llvm/lib/Support/Triple.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/lib/Support/Triple.cpp -@@ -183,7 +183,7 @@ StringRef Triple::getOSTypeName(OSType K - case FreeBSD: return "freebsd"; - case Fuchsia: return "fuchsia"; - case IOS: return "ios"; -- case KFreeBSD: return "kfreebsd"; -+ case kFreeBSD: return "kfreebsd"; - case Linux: return "linux"; - case Lv2: return "lv2"; - case MacOSX: return "macosx"; -@@ -488,7 +488,7 @@ static Triple::OSType parseOS(StringRef - .StartsWith("freebsd", Triple::FreeBSD) - .StartsWith("fuchsia", Triple::Fuchsia) - .StartsWith("ios", Triple::IOS) -- .StartsWith("kfreebsd", Triple::KFreeBSD) -+ .StartsWith("kfreebsd", Triple::kFreeBSD) - .StartsWith("linux", Triple::Linux) - .StartsWith("lv2", Triple::Lv2) - .StartsWith("macos", Triple::MacOSX) -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/lib/Support/Unix/Path.inc -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/llvm/lib/Support/Unix/Path.inc -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/lib/Support/Unix/Path.inc -@@ -62,7 +62,7 @@ - #define FSTATVFS fstatvfs - #define STATVFS_F_FRSIZE(vfs) vfs.f_frsize - #else --#if defined(__OpenBSD__) || defined(__FreeBSD__) -+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include - #include - #elif defined(__linux__) diff --git a/debian/patches/kfreebsd/lib_Target_X86.diff b/debian/patches/kfreebsd/lib_Target_X86.diff deleted file mode 100644 index 636ab783..00000000 --- a/debian/patches/kfreebsd/lib_Target_X86.diff +++ /dev/null @@ -1,26 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/lib/Target/X86/X86Subtarget.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/llvm/lib/Target/X86/X86Subtarget.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/lib/Target/X86/X86Subtarget.cpp -@@ -290,7 +290,7 @@ void X86Subtarget::initSubtargetFeatures - if (StackAlignOverride) - stackAlignment = *StackAlignOverride; - else if (isTargetDarwin() || isTargetLinux() || isTargetSolaris() || -- isTargetKFreeBSD() || In64BitMode) -+ isTargetkFreeBSD() || In64BitMode) - stackAlignment = Align(16); - - // Some CPUs have more overhead for gather. The specified overhead is relative -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/lib/Target/X86/X86Subtarget.h -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/llvm/lib/Target/X86/X86Subtarget.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/lib/Target/X86/X86Subtarget.h -@@ -764,7 +764,7 @@ public: - bool isTargetMachO() const { return TargetTriple.isOSBinFormatMachO(); } - - bool isTargetLinux() const { return TargetTriple.isOSLinux(); } -- bool isTargetKFreeBSD() const { return TargetTriple.isOSKFreeBSD(); } -+ bool isTargetkFreeBSD() const { return TargetTriple.isOSkFreeBSD(); } - bool isTargetGlibc() const { return TargetTriple.isOSGlibc(); } - bool isTargetAndroid() const { return TargetTriple.isAndroid(); } - bool isTargetNaCl() const { return TargetTriple.isOSNaCl(); } diff --git a/debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff b/debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff deleted file mode 100644 index e99a83ce..00000000 --- a/debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff +++ /dev/null @@ -1,18 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/Host/freebsd/Host.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/lldb/source/Host/freebsd/Host.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/Host/freebsd/Host.cpp -@@ -10,6 +10,13 @@ - #include - - #include -+#ifdef __FreeBSD_kernel__ -+# ifdef __amd64__ -+# include -+# else -+# include -+# endif -+#endif - #include - #include - #include diff --git a/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff b/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff deleted file mode 100644 index 7bc11c8f..00000000 --- a/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff +++ /dev/null @@ -1,28 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp -@@ -8,7 +8,9 @@ - - #include - #include -+#ifndef __FreeBSD_kernel__ - #include -+#endif - #include - #include - #include -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp -@@ -9,7 +9,9 @@ - - #include - #include -+#ifndef __FreeBSD_kernel__ - #include -+#endif - #include - #include - #include diff --git a/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff b/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff deleted file mode 100644 index eeb84798..00000000 --- a/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/tools/llvm-shlib/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/llvm/tools/llvm-shlib/CMakeLists.txt -@@ -49,6 +49,7 @@ if(LLVM_BUILD_LLVM_DYLIB) - list(REMOVE_DUPLICATES LIB_NAMES) - if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") -+ OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "kFreeBSD") - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU") - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD") - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia") diff --git a/debian/patches/series b/debian/patches/series index 70ae62c1..777229cd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -91,22 +91,6 @@ remove-apple-clang-manpage.diff # Hurd port hurd/hurd-pathmax.diff -# kfreebsd -# kfreebsd/clang_lib_Basic_Targets.diff -# kfreebsd/CMakeLists.txt.diff -# kfreebsd/compiler-rt_lib.diff -# kfreebsd/include_llvm_ADT_Triple.h.diff -# kfreebsd/kfreebsd-libcxx-threads-detection.diff -# kfreebsd/kfreebsd-openmp.diff -# kfreebsd/kfreebsd-threads-build.diff -# kfreebsd/kfreebsd-triple-clang.diff -# kfreebsd/kfreebsd-triple.diff -# kfreebsd/lib_Support.diff -# kfreebsd/lib_Target_X86.diff -# kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff -# kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff -# kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff - 930008-arm.diff bootstrap-fix-include-next.diff diff --git a/debian/rules b/debian/rules index be977954..79f9d81b 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ endif packages := $(shell dh_listpackages) # no 32bit support -FLANG_ARCHS := amd64 arm64 ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 +FLANG_ARCHS := amd64 arm64 ppc64el ppc64 sparc64 riscv64 loong64 # flang has some memory hogs, of up to 6.2gb per process. Limit the parallel jobs # based on the available memory @@ -108,10 +108,10 @@ DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') include /usr/share/dpkg/architecture.mk -MULTILIB_ARCHS := amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +MULTILIB_ARCHS := amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32 ifeq ($(DERIVATIVE),Ubuntu) ifeq (,$(filter $(DISTRO), bionic focal jammy noble)) - MULTILIB_ARCHS := $(filter-out s390 s390x, $(MULTILIB_ARCHS)) + MULTILIB_ARCHS := $(filter-out s390x, $(MULTILIB_ARCHS)) endif endif @@ -182,7 +182,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64)) STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif -ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel mipsel mips64el powerpc powerpcspe riscv64)) +ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 armel mipsel mips64el powerpc powerpcspe riscv64)) # For some reason, in the stage2 build, when clang is used to compile # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion # everywhere and in all stages @@ -356,7 +356,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV) endif -BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 hurd-amd64 kfreebsd-amd64 kfreebsd-i386 +BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 hurd-amd64 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0) ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold From f10d3d4a18f93a6abfcd5c1937b3faa13ba9bfac Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Sep 2024 17:03:07 +0200 Subject: [PATCH 184/241] * Remove references to powerpcspe. --- debian/changelog | 1 + debian/control | 10 +++++----- debian/control.in | 10 +++++----- debian/libpolly-X.Y-dev.install.in | 2 +- debian/llvm-X.Y-linker-tools.install.in | 2 +- debian/llvm-X.Y-linker-tools.links.in | 2 +- debian/rules | 8 ++++---- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 89eb961c..2f64c8f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Disable the usage-wrapper/memory tracking by default. * Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro. * Remove unused kfreebsd patches, and remove references to kfreebsd and s390. + * Remove references to powerpcspe. [ Aurelien Jarno ] * Enable lldb on riscv64. diff --git a/debian/control b/debian/control index fef5454f..ca77195a 100644 --- a/debian/control +++ b/debian/control @@ -525,7 +525,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-19 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -535,7 +535,7 @@ Description: LLVM-based linker Project. Package: liblld-19 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -549,7 +549,7 @@ Description: LLVM-based linker, library Package: liblld-19-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-19 (= ${binary:Version}), liblld-19 (= ${binary:Version}), libzstd-dev, zlib1g-dev @@ -590,7 +590,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-19 Section: python Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-19 (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -606,7 +606,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-19-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files diff --git a/debian/control.in b/debian/control.in index fc4dfd4b..c025cefe 100644 --- a/debian/control.in +++ b/debian/control.in @@ -525,7 +525,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -535,7 +535,7 @@ Description: LLVM-based linker Project. Package: liblld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -549,7 +549,7 @@ Description: LLVM-based linker, library Package: liblld-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-@LLVM_VERSION@ (= ${binary:Version}), liblld-@LLVM_VERSION@ (= ${binary:Version}), libzstd-dev, zlib1g-dev @@ -590,7 +590,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-@LLVM_VERSION@ Section: python Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -606,7 +606,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-@LLVM_VERSION@-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files diff --git a/debian/libpolly-X.Y-dev.install.in b/debian/libpolly-X.Y-dev.install.in index 12c1309d..422fb4a2 100644 --- a/debian/libpolly-X.Y-dev.install.in +++ b/debian/libpolly-X.Y-dev.install.in @@ -1,3 +1,3 @@ #!/usr/bin/dh-exec -[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/libPolly*.a +[!powerpc] usr/lib/llvm-@LLVM_VERSION@/lib/libPolly*.a diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in index b9bb2552..68d96f39 100644 --- a/debian/llvm-X.Y-linker-tools.install.in +++ b/debian/llvm-X.Y-linker-tools.install.in @@ -1,4 +1,4 @@ #!/usr/bin/dh-exec usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ -[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so +[!powerpc] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so diff --git a/debian/llvm-X.Y-linker-tools.links.in b/debian/llvm-X.Y-linker-tools.links.in index cbafb159..4be12107 100644 --- a/debian/llvm-X.Y-linker-tools.links.in +++ b/debian/llvm-X.Y-linker-tools.links.in @@ -1,3 +1,3 @@ #!/usr/bin/dh-exec -[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so +[!powerpc] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so diff --git a/debian/rules b/debian/rules index 79f9d81b..2544c4b5 100755 --- a/debian/rules +++ b/debian/rules @@ -182,7 +182,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64)) STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif -ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 armel mipsel mips64el powerpc powerpcspe riscv64)) +ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 armel mipsel mips64el powerpc riscv64)) # For some reason, in the stage2 build, when clang is used to compile # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion # everywhere and in all stages @@ -396,7 +396,7 @@ endif # Enable polly (or not) POLLY_ENABLE=yes -ifneq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe)) +ifneq (,$(filter $(DEB_HOST_ARCH), powerpc)) POLLY_ENABLE=no else PROJECTS+=;polly @@ -517,7 +517,7 @@ ifeq (,$(filter-out $(DOC_GENERATION_DISTRO), $(DISTRO))) DOC_GENERATION=no endif -ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe)) +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc)) LIBCXX_WASM_ENABLE=no endif @@ -1215,7 +1215,7 @@ override_dh_auto_install: # Only run on executable, not script chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1` -ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe)) +ifeq (,$(filter $(DEB_HOST_ARCH), powerpc)) ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux)) # To fix custom-library-search-path chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so || true From 2d26549ef2ccb4ba1a62e60dd4c71578bedb5757 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Sep 2024 17:09:50 +0200 Subject: [PATCH 185/241] * Remove references to alpha, hppa, powerpcspe and sh4. --- debian/changelog | 2 +- debian/control | 12 +++++------- debian/control.in | 12 +++++------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f64c8f9..9eab248d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Disable the usage-wrapper/memory tracking by default. * Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro. * Remove unused kfreebsd patches, and remove references to kfreebsd and s390. - * Remove references to powerpcspe. + * Remove references to alpha, hppa, powerpcspe and sh4. [ Aurelien Jarno ] * Enable lldb on riscv64. diff --git a/debian/control b/debian/control index ca77195a..ae673305 100644 --- a/debian/control +++ b/debian/control @@ -525,7 +525,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-19 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc m68k ppc64 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -535,7 +535,7 @@ Description: LLVM-based linker Project. Package: liblld-19 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc m68k ppc64 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -549,7 +549,7 @@ Description: LLVM-based linker, library Package: liblld-19-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc m68k ppc64 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-19 (= ${binary:Version}), liblld-19 (= ${binary:Version}), libzstd-dev, zlib1g-dev @@ -589,8 +589,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-19 Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 loong64 m68k ppc64el riscv64 s390x x32 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-19 (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -605,8 +604,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-19-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed +Architecture: amd64 arm64 armel armhf i386 loong64 m68k ppc64el riscv64 s390x x32 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files diff --git a/debian/control.in b/debian/control.in index c025cefe..ea465098 100644 --- a/debian/control.in +++ b/debian/control.in @@ -525,7 +525,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc m68k ppc64 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -535,7 +535,7 @@ Description: LLVM-based linker Project. Package: liblld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc m68k ppc64 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -549,7 +549,7 @@ Description: LLVM-based linker, library Package: liblld-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc m68k ppc64 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-@LLVM_VERSION@ (= ${binary:Version}), liblld-@LLVM_VERSION@ (= ${binary:Version}), libzstd-dev, zlib1g-dev @@ -589,8 +589,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-@LLVM_VERSION@ Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed +Architecture: @LLDB_ARCHS@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -605,8 +604,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed +Architecture: @LLDB_ARCHS@ Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files From 1fa1b58dcc63b5c252345a4cb7dfdc9d9c7c0c03 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Sep 2024 17:19:06 +0200 Subject: [PATCH 186/241] prepare for upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9eab248d..c97fd0e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc4-3) unstable; urgency=medium [ Matthias Klose ] * Consolidate disabling CMake's package validation checks a bit. @@ -15,7 +15,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Enable lldb on riscv64. * Enable lldb autopkgtest on riscv64. - -- Matthias Klose Thu, 05 Sep 2024 10:59:19 +0200 + -- Matthias Klose Sun, 08 Sep 2024 17:13:38 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-2) unstable; urgency=medium From 7eb47e34d403ce8b30bf8da6e67f3d10610c7bfb Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Sep 2024 17:46:12 +0200 Subject: [PATCH 187/241] * Fix usage-wrapper build dependency. --- debian/changelog | 5 +++-- debian/control | 2 +- debian/rules | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c97fd0e3..3c62e1af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0~++rc4-3) unstable; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc4-4) unstable; urgency=medium [ Matthias Klose ] * Consolidate disabling CMake's package validation checks a bit. @@ -10,12 +10,13 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) unstable; urgency=medium * Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro. * Remove unused kfreebsd patches, and remove references to kfreebsd and s390. * Remove references to alpha, hppa, powerpcspe and sh4. + * Fix usage-wrapper build dependency. [ Aurelien Jarno ] * Enable lldb on riscv64. * Enable lldb autopkgtest on riscv64. - -- Matthias Klose Sun, 08 Sep 2024 17:13:38 +0200 + -- Matthias Klose Sun, 08 Sep 2024 17:36:43 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index ae673305..31508bd7 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, zlib1g-dev, libzstd-dev, g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, - doxygen, + doxygen, time, ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], diff --git a/debian/rules b/debian/rules index 2544c4b5..2be95708 100755 --- a/debian/rules +++ b/debian/rules @@ -87,6 +87,7 @@ NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' / TIME_COMMAND = $(CURDIR)/debian/usage-wrapper.py $(SUMMARY_ONLY) -j $(NJOBS) --base-memory -m 4.0 -o usage-$(notdir $@)-$(DEB_HOST_ARCH).svg TIME_COMMAND = /bin/time -v +USAGE_BUILD_DEP = $(EMPTY) time, ifneq (,$(findstring usage-wrapper, $(TIME_COMMAND))) ifeq ($(DERIVATIVE),Ubuntu) USAGE_BUILD_DEP = $(EMPTY) python3:any, python3-psutil, python3-matplotlib [!i386], From f1ce55f708cb1e8a852f13f57d7cd30b0c9ca3da Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 9 Sep 2024 10:45:07 +0200 Subject: [PATCH 188/241] * Move the libLLVM.so.1 symlink into llvm-19-dev. Closes: #1081192. --- debian/changelog | 6 ++++++ debian/control | 6 ++++-- debian/control.in | 6 ++++-- debian/libllvmX.Y.links.in | 14 -------------- debian/llvm-X.Y-dev.links.in | 10 ++++++++++ 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c62e1af..9b9572f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.0~++rc4-5) UNRELEASED; urgency=medium + + * Move the libLLVM.so.1 symlink into llvm-19-dev. Closes: #1081192. + + -- Matthias Klose Mon, 09 Sep 2024 10:37:51 +0200 + llvm-toolchain-19 (1:19.1.0~++rc4-4) unstable; urgency=medium [ Matthias Klose ] diff --git a/debian/control b/debian/control index 31508bd7..2098d294 100644 --- a/debian/control +++ b/debian/control @@ -347,8 +347,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same -Breaks: llvm19-dev (<< 1:19.1.0~++rc3-1~exp2) -Replaces: llvm19-dev (<< 1:19.1.0~++rc3-1~exp2) +Breaks: llvm-19-dev (<< 1:19.1.0~++rc3-1~exp2) +Replaces: llvm-19-dev (<< 1:19.1.0~++rc3-1~exp2) Description: Modular compiler and toolchain technologies, runtime library LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -422,6 +422,8 @@ Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, llvm-19 (= ${binary:Version}), libllvm19 (= ${binary:Version}), libncurses-dev, llvm-19-tools (= ${binary:Version}), libclang-cpp19 (= ${binary:Version}), libxml2-dev, libz3-dev [!sh4], +Breaks: libllvm19 (<< 1:19.1.0~++rc4-5) +Replaces: libllvm19 (<< 1:19.1.0~++rc4-5) Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other diff --git a/debian/control.in b/debian/control.in index ea465098..bf23b86a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -347,8 +347,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same -Breaks: llvm@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) -Replaces: llvm@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) +Breaks: llvm-@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) +Replaces: llvm-@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) Description: Modular compiler and toolchain technologies, runtime library LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -422,6 +422,8 @@ Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@ (= ${binary:Version}), libncurses-dev, llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@ (= ${binary:Version}), libxml2-dev, @Z3_DEV_DEP@ +Breaks: libllvm@LLVM_VERSION@ (<< 1:19.1.0~++rc4-5) +Replaces: libllvm@LLVM_VERSION@ (<< 1:19.1.0~++rc4-5) Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 8166bf82..7edd6f22 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -2,17 +2,3 @@ # symlink to the soname in the llvm libdir usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ - -# FIXME: CMake requires this file, but for what? Fix LLVMExports.cmake instead? -# -# CMake Error at /usr/lib/llvm-19/lib/cmake/llvm/LLVMExports.cmake:1908 (message): -# The imported target "LLVM" references the file -# -# "/usr/lib/llvm-19/lib/libLLVM.so.1" -# -# but this file does not exist. -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 - -# FIXME: why is this one needed? This already is in the llvm-dev package in the llvm libdir -# create symlink to the symlink installed by upstream -#usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index b6e0cfd7..55d07e62 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -11,3 +11,13 @@ usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Debug+Asserts usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm usr/lib/llvm-@LLVM_VERSION@/cmake usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake + +# FIXME: CMake requires this file, but for what? Fix LLVMExports.cmake instead? +# +# CMake Error at /usr/lib/llvm-19/lib/cmake/llvm/LLVMExports.cmake:1908 (message): +# The imported target "LLVM" references the file +# +# "/usr/lib/llvm-19/lib/libLLVM.so.1" +# +# but this file does not exist. +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 From 2817b88ad93034d1fe6a50552f92c30b113c7254 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 9 Sep 2024 11:20:27 +0200 Subject: [PATCH 189/241] prepare for upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b9572f4..549ad5b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -llvm-toolchain-19 (1:19.1.0~++rc4-5) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0~++rc4-5) unstable; urgency=medium * Move the libLLVM.so.1 symlink into llvm-19-dev. Closes: #1081192. - -- Matthias Klose Mon, 09 Sep 2024 10:37:51 +0200 + -- Matthias Klose Mon, 09 Sep 2024 11:20:16 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-4) unstable; urgency=medium From b16df34ac4413b490b28f4f66fa578c90400f7e0 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 10 Sep 2024 08:00:07 +0200 Subject: [PATCH 190/241] * debian/qualify-clang.sh: Skip llvmlibc test, if libomp-dev is not available. --- debian/changelog | 6 ++++++ debian/qualify-clang.sh | 22 +++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 549ad5b4..412a5b9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.0~++rc4-6) UNRELEASED; urgency=medium + + * debian/qualify-clang.sh: Skip llvmlibc test, if libomp-dev is not available. + + -- Matthias Klose Tue, 10 Sep 2024 07:59:17 +0200 + llvm-toolchain-19 (1:19.1.0~++rc4-5) unstable; urgency=medium * Move the libLLVM.so.1 symlink into llvm-19-dev. Closes: #1081192. diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 56a45b95..11ed6ce4 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1139,8 +1139,9 @@ else fi # libc -echo "Testing llvmlibc-$VERSION-dev ..." -echo ' +if dpkg -l libllvmlibc-$VERSION-dev >/dev/null 2>&1; then + echo "Testing llvmlibc-$VERSION-dev ..." + echo ' #include int main(void) { @@ -1149,14 +1150,17 @@ int main(void) return 1; return 0; }' > main.c -clang-$VERSION -static -nostdlib -nolibc -L/usr/lib/llvm-$VERSION/lib/ -lllvmlibc main.c -o foo -if ! ldd foo 2>&1|grep -qv libc.; then - echo "linked against regular libc" - exit -1 -fi + clang-$VERSION -static -nostdlib -nolibc -L/usr/lib/llvm-$VERSION/lib/ -lllvmlibc main.c -o foo + if ! ldd foo 2>&1|grep -qv libc.; then + echo "linked against regular libc" + exit -1 + fi -# segfault for now -./foo || true + # segfault for now + ./foo || true +else + echo "libllvmlibc check skipped, no libllvmlibc-$VERSION-dev available." +endif # libclc echo "Testing libclc-$VERSION-dev ..." From 30a2a8745bb245cc3c2576d2781167c66461b2ad Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 10 Sep 2024 08:04:32 +0200 Subject: [PATCH 191/241] fix changelog entry --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 412a5b9c..8fda9078 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-6) UNRELEASED; urgency=medium - * debian/qualify-clang.sh: Skip llvmlibc test, if libomp-dev is not available. + * debian/qualify-clang.sh: Skip llvmlibc test, if libllvmlibc-dev is not + available. -- Matthias Klose Tue, 10 Sep 2024 07:59:17 +0200 From c4ecbecd5ce3cac27f4ebc182d127f06e8d1e0f5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 9 Sep 2024 14:00:14 +0200 Subject: [PATCH 192/241] also handle /usr/bin/time --- debian/rules | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 2be95708..9d5d8070 100755 --- a/debian/rules +++ b/debian/rules @@ -86,7 +86,8 @@ NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' / 'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2 Date: Tue, 10 Sep 2024 14:26:51 +0200 Subject: [PATCH 193/241] taken from the trunk: also handle /usr/bin/time --- debian/rules | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 2be95708..9d5d8070 100755 --- a/debian/rules +++ b/debian/rules @@ -86,7 +86,8 @@ NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' / 'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2 Date: Tue, 10 Sep 2024 17:11:28 +0200 Subject: [PATCH 194/241] [ YunQiang Su ] * also pass -mxgot in LDFLAGS. * d/p/mips-mlir-xgot.diff: Pass -mxgot for mlir. --- debian/changelog | 5 +++++ debian/patches/mips-mlir-xgot.diff | 15 +++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 4 files changed, 22 insertions(+) create mode 100644 debian/patches/mips-mlir-xgot.diff diff --git a/debian/changelog b/debian/changelog index 8fda9078..3560ac17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ llvm-toolchain-19 (1:19.1.0~++rc4-6) UNRELEASED; urgency=medium + [ Matthias Klose ] * debian/qualify-clang.sh: Skip llvmlibc test, if libllvmlibc-dev is not available. + [ YunQiang Su ] + * also pass -mxgot in LDFLAGS. + * d/p/mips-mlir-xgot.diff: Pass -mxgot for mlir. + -- Matthias Klose Tue, 10 Sep 2024 07:59:17 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-5) unstable; urgency=medium diff --git a/debian/patches/mips-mlir-xgot.diff b/debian/patches/mips-mlir-xgot.diff new file mode 100644 index 00000000..a7c293df --- /dev/null +++ b/debian/patches/mips-mlir-xgot.diff @@ -0,0 +1,15 @@ +Index: llvm-toolchain-19-19.1.0~++rc4/mlir/CMakeLists.txt +=================================================================== +--- llvm-toolchain-19-19.1.0~++rc4.orig/mlir/CMakeLists.txt ++++ llvm-toolchain-19-19.1.0~++rc4/mlir/CMakeLists.txt +@@ -93,6 +93,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" A + append_if(CXX_SUPPORTS_WNO_UNUSED_BUT_SET_PARAMETER "-Wno-unused-but-set-parameter" CMAKE_CXX_FLAGS) + endif() + ++check_symbol_exists(__mips "" __MIPS) ++append_if(__MIPS "-mxgot" CMAKE_C_FLAGS) ++append_if(__MIPS "-mxgot" CMAKE_CXX_FLAGS) ++ + # Installing the headers and docs needs to depend on generating any public + # tablegen'd targets. + # mlir-generic-headers are dialect-independent. diff --git a/debian/patches/series b/debian/patches/series index 777229cd..6d0bbe62 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -136,3 +136,4 @@ libsanitizer-timebits.diff offload-disable-static-assert.diff link-with-package-metadata.diff env-lld-package-metadata.diff +mips-mlir-xgot.diff diff --git a/debian/rules b/debian/rules index 9d5d8070..6d2f4498 100755 --- a/debian/rules +++ b/debian/rules @@ -266,6 +266,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64 CFLAGS_EXTRA += -mxgot CXXFLAGS_EXTRA += -mxgot + LDFLAGS_EXTRA += -mxgot endif ifneq (,$(filter $(DEB_HOST_ARCH),powerpc)) From e1ab65cefa4201fcc9853f6f186ea355059b6984 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 16 Sep 2024 11:16:55 +0200 Subject: [PATCH 195/241] * Build-depend on llvm-spirv-19. --- debian/changelog | 3 ++- debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3560ac17..7192e741 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,12 +3,13 @@ llvm-toolchain-19 (1:19.1.0~++rc4-6) UNRELEASED; urgency=medium [ Matthias Klose ] * debian/qualify-clang.sh: Skip llvmlibc test, if libllvmlibc-dev is not available. + * Build-depend on llvm-spirv-19. [ YunQiang Su ] * also pass -mxgot in LDFLAGS. * d/p/mips-mlir-xgot.diff: Pass -mxgot for mlir. - -- Matthias Klose Tue, 10 Sep 2024 07:59:17 +0200 + -- Matthias Klose Mon, 16 Sep 2024 11:16:39 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-5) unstable; urgency=medium diff --git a/debian/control b/debian/control index 2098d294..2a04ee42 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled - llvm-spirv-18 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , + llvm-spirv-19 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , spirv-tools [linux-any] | hello [linux-any], wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev , diff --git a/debian/control.in b/debian/control.in index bf23b86a..55f680d3 100644 --- a/debian/control.in +++ b/debian/control.in @@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled - llvm-spirv-18 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , + llvm-spirv-19 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , spirv-tools [linux-any] | hello [linux-any], wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev , From 3ab346721f6f7592a5139969889c3107ca107ca7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 17 Sep 2024 09:11:18 +0200 Subject: [PATCH 196/241] Fix The following packages have unmet dependencies: libllvm19 : Breaks: llvm-19-dev (< 1:19.1.0~++rc3-1~exp2) but 1:19.1.0~++20240910033111+327ca6c02f0d-1~exp1~20240910153233.33 is to be installed llvm-19-dev : Breaks: libllvm19 (< 1:19.1.0~++rc4-5) but 1:19.1.0~++20240910033111+327ca6c02f0d-1~exp1~20240910153233.33 is to be installed E: Unable to correct problems, you have held broken packages. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 6d2f4498..7e4f0f3f 100755 --- a/debian/rules +++ b/debian/rules @@ -719,8 +719,8 @@ stamps/preconfigure: # workaround the breaks/replaces/conflicts introduced with the libc++ move # we update the version to make it work with apt.llvm.org # Yeah, this is ugly but I don't know how to do better - if test "$(LLVM_VERSION)" = "17"; then \ - sed -i -e "s|(<< 1:17.0.6-2)|(<< 1:17.0.6~++20231206041259)|g" debian/control; \ + if test "$(LLVM_VERSION)" = "19"; then \ + sed -i -e "s|(<< 1:19.1.0~++rc3-1~exp2)|(<< 1:19.1.0~++20240910033111)|g" debian/control; \ fi # llvm-spirv was found, so we can enable *.spv files. Debian From 65c22232e72db2adb9ba6a19afe3430e914e019f Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 17 Sep 2024 19:37:40 +0200 Subject: [PATCH 197/241] * New upstream release 19.1.0. --- debian/changelog | 6 ++++-- debian/control | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7192e741..a08c799d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -llvm-toolchain-19 (1:19.1.0~++rc4-6) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0-1) unstable; urgency=medium + + * New upstream release 19.1.0. [ Matthias Klose ] * debian/qualify-clang.sh: Skip llvmlibc test, if libllvmlibc-dev is not @@ -9,7 +11,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-6) UNRELEASED; urgency=medium * also pass -mxgot in LDFLAGS. * d/p/mips-mlir-xgot.diff: Pass -mxgot for mlir. - -- Matthias Klose Mon, 16 Sep 2024 11:16:39 +0200 + -- Matthias Klose Tue, 17 Sep 2024 18:04:21 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-5) unstable; urgency=medium diff --git a/debian/control b/debian/control index 2a04ee42..d24bba33 100644 --- a/debian/control +++ b/debian/control @@ -347,8 +347,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same -Breaks: llvm-19-dev (<< 1:19.1.0~++rc3-1~exp2) -Replaces: llvm-19-dev (<< 1:19.1.0~++rc3-1~exp2) +Breaks: llvm-19-dev (<< 1:19.1.0~++20240910033111) +Replaces: llvm-19-dev (<< 1:19.1.0~++20240910033111) Description: Modular compiler and toolchain technologies, runtime library LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other From 42f059d5a11da9cf30494c5ba2728eb749cc4127 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 17 Sep 2024 19:57:39 +0200 Subject: [PATCH 198/241] * Call dh_makeshlibs with the version of the first upstream release (1:19.1.0). Looking back at the 1.18 release cycle, these libraries didn't see any instability in the ABIs. --- debian/changelog | 8 ++++++++ debian/rules | 12 ++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a08c799d..b4a3ab9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-19 (1:19.1.0-2) UNRELEASED; urgency=medium + + * Call dh_makeshlibs with the version of the first upstream + release (1:19.1.0). Looking back at the 1.18 release cycle, + these libraries didn't see any instability in the ABIs. + + -- Matthias Klose Tue, 17 Sep 2024 19:51:17 +0200 + llvm-toolchain-19 (1:19.1.0-1) unstable; urgency=medium * New upstream release 19.1.0. diff --git a/debian/rules b/debian/rules index 7e4f0f3f..e91099ad 100755 --- a/debian/rules +++ b/debian/rules @@ -1427,10 +1427,14 @@ endif override_dh_makeshlibs: - dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) - dh_makeshlibs -pliblldb-$(LLVM_VERSION) - dh_makeshlibs -plibllvm$(LLVM_VERSION) - dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) + dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) \ + '-Vlibclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:19.1.0)' + dh_makeshlibs -pliblldb-$(LLVM_VERSION) \ + '-V (liblldb-$(LLVM_VERSION) >= 1:19.1.0)' + dh_makeshlibs -plibllvm$(LLVM_VERSION) \ + '-V (libllvm$(LLVM_VERSION) >= 1:19.1.0)' + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) \ + '-V (libomp$(SONAME_OPENMP)-$(LLVM_VERSION) >= 1:19.1.0)' dh_makeshlibs --remaining-packages -V override_dh_shlibdeps: From 87f93dc71e7475e2b1600bb2519edff469f8ee01 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 18 Sep 2024 09:43:51 +0200 Subject: [PATCH 199/241] fix https://github.com/opencollab/llvm-jenkins.debian.net/issues/29 --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index e91099ad..0f897940 100755 --- a/debian/rules +++ b/debian/rules @@ -721,6 +721,7 @@ stamps/preconfigure: # Yeah, this is ugly but I don't know how to do better if test "$(LLVM_VERSION)" = "19"; then \ sed -i -e "s|(<< 1:19.1.0~++rc3-1~exp2)|(<< 1:19.1.0~++20240910033111)|g" debian/control; \ + sed -i -e "s|(<< 1:19.1.0~++rc4-5)|(<< 1:19.1.0~++20240910033111)|g" debian/control; \ fi # llvm-spirv was found, so we can enable *.spv files. Debian From 550cea5cfed9b14baec9d9b34779a8bc13a4915e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 18 Sep 2024 09:44:08 +0200 Subject: [PATCH 200/241] fix the date --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 0f897940..22a28cdf 100755 --- a/debian/rules +++ b/debian/rules @@ -721,7 +721,7 @@ stamps/preconfigure: # Yeah, this is ugly but I don't know how to do better if test "$(LLVM_VERSION)" = "19"; then \ sed -i -e "s|(<< 1:19.1.0~++rc3-1~exp2)|(<< 1:19.1.0~++20240910033111)|g" debian/control; \ - sed -i -e "s|(<< 1:19.1.0~++rc4-5)|(<< 1:19.1.0~++20240910033111)|g" debian/control; \ + sed -i -e "s|(<< 1:19.1.0~++rc4-5)|(<< 1:19.1.0~++20240917071600)|g" debian/control; \ fi # llvm-spirv was found, so we can enable *.spv files. Debian From 813d3541dd29ad4525391eccbd4dd2f1d98c76ed Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 18 Sep 2024 09:58:34 +0200 Subject: [PATCH 201/241] fix typo --- debian/qualify-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 11ed6ce4..5d702935 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1160,7 +1160,7 @@ int main(void) ./foo || true else echo "libllvmlibc check skipped, no libllvmlibc-$VERSION-dev available." -endif +fi # libclc echo "Testing libclc-$VERSION-dev ..." From f4bc1295e28f19ffc2a5aff2ff1a53666a19201f Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 18 Sep 2024 10:33:13 +0200 Subject: [PATCH 202/241] * debian/qualify-clang.sh: Fix typo. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4a3ab9b..82bad2d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -llvm-toolchain-19 (1:19.1.0-2) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0-2) unstable; urgency=medium * Call dh_makeshlibs with the version of the first upstream release (1:19.1.0). Looking back at the 1.18 release cycle, these libraries didn't see any instability in the ABIs. + * debian/qualify-clang.sh: Fix typo. - -- Matthias Klose Tue, 17 Sep 2024 19:51:17 +0200 + -- Matthias Klose Wed, 18 Sep 2024 10:29:19 +0200 llvm-toolchain-19 (1:19.1.0-1) unstable; urgency=medium From 80784a25673d593938da20e8a584679e677d5e04 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 18 Sep 2024 17:28:06 +0200 Subject: [PATCH 203/241] * Fix typo in dh_makeshlibs calls. --- debian/changelog | 6 ++++++ debian/rules | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 82bad2d4..f0297a69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.0-3) unstable; urgency=medium + + * Fix typo in dh_makeshlibs calls. + + -- Matthias Klose Wed, 18 Sep 2024 17:26:29 +0200 + llvm-toolchain-19 (1:19.1.0-2) unstable; urgency=medium * Call dh_makeshlibs with the version of the first upstream diff --git a/debian/rules b/debian/rules index 22a28cdf..25261f95 100755 --- a/debian/rules +++ b/debian/rules @@ -1431,11 +1431,11 @@ override_dh_makeshlibs: dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) \ '-Vlibclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:19.1.0)' dh_makeshlibs -pliblldb-$(LLVM_VERSION) \ - '-V (liblldb-$(LLVM_VERSION) >= 1:19.1.0)' + '-Vliblldb-$(LLVM_VERSION) (>= 1:19.1.0)' dh_makeshlibs -plibllvm$(LLVM_VERSION) \ - '-V (libllvm$(LLVM_VERSION) >= 1:19.1.0)' + '-Vlibllvm$(LLVM_VERSION) (>= 1:19.1.0)' dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) \ - '-V (libomp$(SONAME_OPENMP)-$(LLVM_VERSION) >= 1:19.1.0)' + '-Vlibomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= 1:19.1.0)' dh_makeshlibs --remaining-packages -V override_dh_shlibdeps: From d692c71cdf097e22cff3061a23bae1a252feccd9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 19 Sep 2024 17:08:11 +0200 Subject: [PATCH 204/241] refresh the control --- debian/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index d24bba33..e1b50ae2 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 ppc64el riscv64 s390x], - libpfm4-dev [linux-any], python3-setuptools, libz3-dev [!sh4], + libpfm4-dev [linux-any], python3-setuptools, # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled @@ -347,8 +347,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same -Breaks: llvm-19-dev (<< 1:19.1.0~++20240910033111) -Replaces: llvm-19-dev (<< 1:19.1.0~++20240910033111) +Breaks: llvm-19-dev (<< 1:19.1.0~++rc3-1~exp2) +Replaces: llvm-19-dev (<< 1:19.1.0~++rc3-1~exp2) Description: Modular compiler and toolchain technologies, runtime library LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -421,7 +421,7 @@ Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, llvm-19 (= ${binary:Version}), libllvm19 (= ${binary:Version}), libncurses-dev, llvm-19-tools (= ${binary:Version}), libclang-cpp19 (= ${binary:Version}), - libxml2-dev, libz3-dev [!sh4], + libxml2-dev, Breaks: libllvm19 (<< 1:19.1.0~++rc4-5) Replaces: libllvm19 (<< 1:19.1.0~++rc4-5) Description: Modular compiler and toolchain technologies, libraries and headers From fa20800fb5f4ae33eeff329c2fc7d88396c0cb66 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 19 Sep 2024 17:11:21 +0200 Subject: [PATCH 205/241] Adjust the workaround for apt.llvm.org version upgrades https://github.com/llvm/llvm-project/issues/109276 --- debian/changelog | 7 +++++++ debian/control | 4 ++-- debian/rules | 26 ++++++++++++++++++-------- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index f0297a69..1b634f30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-19 (1:19.1.0-4) unstable; urgency=medium + + * Adjust the workaround for apt.llvm.org version upgrades + https://github.com/llvm/llvm-project/issues/109276 + + -- + llvm-toolchain-19 (1:19.1.0-3) unstable; urgency=medium * Fix typo in dh_makeshlibs calls. diff --git a/debian/control b/debian/control index e1b50ae2..2c7ef0fd 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 ppc64el riscv64 s390x], - libpfm4-dev [linux-any], python3-setuptools, + libpfm4-dev [linux-any], python3-setuptools, # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled @@ -421,7 +421,7 @@ Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, llvm-19 (= ${binary:Version}), libllvm19 (= ${binary:Version}), libncurses-dev, llvm-19-tools (= ${binary:Version}), libclang-cpp19 (= ${binary:Version}), - libxml2-dev, + libxml2-dev, Breaks: libllvm19 (<< 1:19.1.0~++rc4-5) Replaces: libllvm19 (<< 1:19.1.0~++rc4-5) Description: Modular compiler and toolchain technologies, libraries and headers diff --git a/debian/rules b/debian/rules index 25261f95..9892410e 100755 --- a/debian/rules +++ b/debian/rules @@ -720,8 +720,10 @@ stamps/preconfigure: # we update the version to make it work with apt.llvm.org # Yeah, this is ugly but I don't know how to do better if test "$(LLVM_VERSION)" = "19"; then \ + if echo $(LLVM_VERSION_SNAPSHOT)| grep -q "~++"; then \ sed -i -e "s|(<< 1:19.1.0~++rc3-1~exp2)|(<< 1:19.1.0~++20240910033111)|g" debian/control; \ sed -i -e "s|(<< 1:19.1.0~++rc4-5)|(<< 1:19.1.0~++20240917071600)|g" debian/control; \ + fi; \ fi # llvm-spirv was found, so we can enable *.spv files. Debian @@ -1428,14 +1430,22 @@ endif override_dh_makeshlibs: - dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) \ - '-Vlibclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:19.1.0)' - dh_makeshlibs -pliblldb-$(LLVM_VERSION) \ - '-Vliblldb-$(LLVM_VERSION) (>= 1:19.1.0)' - dh_makeshlibs -plibllvm$(LLVM_VERSION) \ - '-Vlibllvm$(LLVM_VERSION) (>= 1:19.1.0)' - dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) \ - '-Vlibomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= 1:19.1.0)' +# for apt.llvm.org + if echo $(LLVM_VERSION_SNAPSHOT)| grep -q "~++"; then \ + dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION); \ + dh_makeshlibs -pliblldb-$(LLVM_VERSION); \ + dh_makeshlibs -plibllvm$(LLVM_VERSION); \ + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION); \ + else \ + dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) \ + '-Vlibclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:19.1.0)'; \ + dh_makeshlibs -pliblldb-$(LLVM_VERSION) \ + '-Vliblldb-$(LLVM_VERSION) (>= 1:19.1.0)'; \ + dh_makeshlibs -plibllvm$(LLVM_VERSION) \ + '-Vlibllvm$(LLVM_VERSION) (>= 1:19.1.0)'; \ + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) \ + '-Vlibomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= 1:19.1.0)'; \ + fi dh_makeshlibs --remaining-packages -V override_dh_shlibdeps: From b7452b1693e87bd8a6c59c4debfd7b9addbe688e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 20 Sep 2024 08:57:50 +0200 Subject: [PATCH 206/241] fix changelog entry --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b634f30..d8efae62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -llvm-toolchain-19 (1:19.1.0-4) unstable; urgency=medium +llvm-toolchain-19 (1:19.1.0-4) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * Adjust the workaround for apt.llvm.org version upgrades https://github.com/llvm/llvm-project/issues/109276 - -- + -- Matthias Klose Wed, 18 Sep 2024 17:26:29 +0200 llvm-toolchain-19 (1:19.1.0-3) unstable; urgency=medium From 826ba80ee20570e981246ea5db5ea39fcf5041ea Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 20 Sep 2024 10:10:56 +0200 Subject: [PATCH 207/241] * Don't relax versioned shlibs dependencies for snapshot builds and release versions. --- debian/changelog | 4 ++++ debian/rules | 44 ++++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8efae62..02428a2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ llvm-toolchain-19 (1:19.1.0-4) UNRELEASED; urgency=medium * Adjust the workaround for apt.llvm.org version upgrades https://github.com/llvm/llvm-project/issues/109276 + [ Matthias Klose ] + * Don't relax versioned shlibs dependencies for snapshot builds and + release versions. + -- Matthias Klose Wed, 18 Sep 2024 17:26:29 +0200 llvm-toolchain-19 (1:19.1.0-3) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 9892410e..f72b1628 100755 --- a/debian/rules +++ b/debian/rules @@ -12,11 +12,12 @@ GXX_VERSIONED_PACKAGE := $(shell dpkg-query -W -f '$${Depends}' g++ | grep -o GXX_VERSIONED_EXECUTABLE := $(shell dpkg -L $(GXX_VERSIONED_PACKAGE) | grep '/usr/bin/g++-[0-9][0-9.]*' | xargs ls -d | tail -n1 ) GCC_VERSION := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE)) +PKG_VERSION := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}') LLVM_EPOCH := 1: -LLVM_VERSION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p") -LLVM_VERSION_FULL := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1,p") -LLVM_VERSION_MINOR := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:[0-9]+\.([0-9]+)\.[0-9]+.*,\1,p") -LLVM_VERSION_SNAPSHOT := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:(.*),\1,p") +LLVM_VERSION := $(shell echo $(PKG_VERSION) | sed -rne "s,^1:([0-9]+).*,\1,p") +LLVM_VERSION_FULL := $(shell echo $(PKG_VERSION) | sed -rne "s,^1:([0-9.]+)(~|-)(.*),\1,p") +LLVM_VERSION_MINOR := $(shell echo $(PKG_VERSION) | sed -rne "s,^1:[0-9]+\.([0-9]+)\.[0-9]+.*,\1,p") +LLVM_VERSION_SNAPSHOT := $(shell echo $(PKG_VERSION) | sed -rne "s,^1:(.*),\1,p") ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL)) LLVM_VERSION_FULL := $(LLVM_VERSION).0.0 LLVM_VERSION_MINOR := 0 @@ -1429,23 +1430,26 @@ endif rm -rf $(TARGET_BUILD) +# for apt.llvm.org and prerelease versions, we are depending on the +# upstream version. After release, assume that the ABIs don't change +# anymore with the point releases (X.Y.1, Y.Y.2, ...) +LLVM_RELEASE := $(LLVM_EPOCH)$(LLVM_VERSION).$(LLVM_VERSION_MINOR).0 override_dh_makeshlibs: -# for apt.llvm.org - if echo $(LLVM_VERSION_SNAPSHOT)| grep -q "~++"; then \ - dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION); \ - dh_makeshlibs -pliblldb-$(LLVM_VERSION); \ - dh_makeshlibs -plibllvm$(LLVM_VERSION); \ - dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION); \ - else \ - dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) \ - '-Vlibclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:19.1.0)'; \ - dh_makeshlibs -pliblldb-$(LLVM_VERSION) \ - '-Vliblldb-$(LLVM_VERSION) (>= 1:19.1.0)'; \ - dh_makeshlibs -plibllvm$(LLVM_VERSION) \ - '-Vlibllvm$(LLVM_VERSION) (>= 1:19.1.0)'; \ - dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) \ - '-Vlibomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= 1:19.1.0)'; \ - fi +ifneq (,$(findstring ~,$(PKG_VERSION)) + dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) + dh_makeshlibs -pliblldb-$(LLVM_VERSION) + dh_makeshlibs -plibllvm$(LLVM_VERSION) + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) +else + dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) \ + '-Vlibclang$(SONAME_EXT)-$(LLVM_VERSION) (>= $(LLVM_RELEASE))' + dh_makeshlibs -pliblldb-$(LLVM_VERSION) \ + '-Vliblldb-$(LLVM_VERSION) (>= $(LLVM_RELEASE))' + dh_makeshlibs -plibllvm$(LLVM_VERSION) \ + '-Vlibllvm$(LLVM_VERSION) (>= $(LLVM_RELEASE))' + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) \ + '-Vlibomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= $(LLVM_RELEASE))' +endif dh_makeshlibs --remaining-packages -V override_dh_shlibdeps: From ae43dcf02293c71d14cc4f7f067fb3438a4679bd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 20 Sep 2024 13:17:27 +0200 Subject: [PATCH 208/241] add missing ) --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f72b1628..843e8b9e 100755 --- a/debian/rules +++ b/debian/rules @@ -1435,7 +1435,7 @@ endif # anymore with the point releases (X.Y.1, Y.Y.2, ...) LLVM_RELEASE := $(LLVM_EPOCH)$(LLVM_VERSION).$(LLVM_VERSION_MINOR).0 override_dh_makeshlibs: -ifneq (,$(findstring ~,$(PKG_VERSION)) +ifneq (,$(findstring ~,$(PKG_VERSION))) dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) dh_makeshlibs -pliblldb-$(LLVM_VERSION) dh_makeshlibs -plibllvm$(LLVM_VERSION) From d4cc10bc9471cf69b26e171421e8e13a91d79f72 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 20 Sep 2024 13:24:21 +0200 Subject: [PATCH 209/241] Ensure that at least 1 CPU is used for build Thanks to Santiago Vila for the patch (Closes: #1082360) --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 02428a2a..12efc0e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ llvm-toolchain-19 (1:19.1.0-4) UNRELEASED; urgency=medium [ Sylvestre Ledru ] * Adjust the workaround for apt.llvm.org version upgrades https://github.com/llvm/llvm-project/issues/109276 + * Ensure that at least 1 CPU is used for build + Thanks to Santiago Vila for the patch + (Closes: #1082360) [ Matthias Klose ] * Don't relax versioned shlibs dependencies for snapshot builds and diff --git a/debian/rules b/debian/rules index 843e8b9e..8736d61f 100755 --- a/debian/rules +++ b/debian/rules @@ -84,7 +84,7 @@ else endif NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' /proc/meminfo`; \ awk -vn=$(NCPUS) -vmt=$$mt -vm=$(MEM_PER_CPU) \ - 'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2 Date: Sat, 21 Sep 2024 10:40:34 +0200 Subject: [PATCH 210/241] * libllvm19: No symlinks in the llvm-19 subdir. Closes: #1081192, #1082495. --- debian/changelog | 1 + debian/control | 8 ++++---- debian/control.in | 4 ++-- debian/libllvmX.Y.links.in | 3 +-- debian/llvm-X.Y-dev.links.in | 3 +++ 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12efc0e9..afd02f2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ llvm-toolchain-19 (1:19.1.0-4) UNRELEASED; urgency=medium [ Matthias Klose ] * Don't relax versioned shlibs dependencies for snapshot builds and release versions. + * libllvm19: No symlinks in the llvm-19 subdir. Closes: #1081192, #1082495. -- Matthias Klose Wed, 18 Sep 2024 17:26:29 +0200 diff --git a/debian/control b/debian/control index 2c7ef0fd..0f6e8992 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 ppc64el riscv64 s390x], - libpfm4-dev [linux-any], python3-setuptools, + libpfm4-dev [linux-any], python3-setuptools, libz3-dev [!sh4], # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled @@ -421,9 +421,9 @@ Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, llvm-19 (= ${binary:Version}), libllvm19 (= ${binary:Version}), libncurses-dev, llvm-19-tools (= ${binary:Version}), libclang-cpp19 (= ${binary:Version}), - libxml2-dev, -Breaks: libllvm19 (<< 1:19.1.0~++rc4-5) -Replaces: libllvm19 (<< 1:19.1.0~++rc4-5) + libxml2-dev, libz3-dev [!sh4], +Breaks: libllvm19 (<< 1:19.1.0-4) +Replaces: libllvm19 (<< 1:19.1.0-4) Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other diff --git a/debian/control.in b/debian/control.in index 55f680d3..933e8cb5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -422,8 +422,8 @@ Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@ (= ${binary:Version}), libncurses-dev, llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@ (= ${binary:Version}), libxml2-dev, @Z3_DEV_DEP@ -Breaks: libllvm@LLVM_VERSION@ (<< 1:19.1.0~++rc4-5) -Replaces: libllvm@LLVM_VERSION@ (<< 1:19.1.0~++rc4-5) +Breaks: libllvm@LLVM_VERSION@ (<< 1:19.1.0-4) +Replaces: libllvm@LLVM_VERSION@ (<< 1:19.1.0-4) Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 7edd6f22..3573f38e 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,4 +1,3 @@ # provide symlinks in the LLVM subdir -# symlink to the soname in the llvm libdir -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ +# no symlinks in the LLVM subdir, the package is M-A: same diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index 55d07e62..0ef210fb 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -21,3 +21,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm usr/lib/llvm-@LLVM_VERSION@/share/llv # # but this file does not exist. usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 + +# symlink to the soname in the llvm libdir +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ From 55a6718dea969ff17e893ed7973f77224dbd9613 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 21 Sep 2024 10:46:28 +0200 Subject: [PATCH 211/241] adjust the replace --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 8736d61f..4b6b6da9 100755 --- a/debian/rules +++ b/debian/rules @@ -724,6 +724,7 @@ stamps/preconfigure: if echo $(LLVM_VERSION_SNAPSHOT)| grep -q "~++"; then \ sed -i -e "s|(<< 1:19.1.0~++rc3-1~exp2)|(<< 1:19.1.0~++20240910033111)|g" debian/control; \ sed -i -e "s|(<< 1:19.1.0~++rc4-5)|(<< 1:19.1.0~++20240917071600)|g" debian/control; \ + sed -i -e "s|(<< 1:19.1.0-4)|(<< 1:19.1.0~++20240917071600)|g" debian/control; \ fi; \ fi From 1b04fdf25e142704314e2b4ee498d0d147a7a1ba Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 22 Sep 2024 16:38:57 +0200 Subject: [PATCH 212/241] prepare for upload --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index afd02f2c..5d8ea0b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0-4) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0-4) unstable; urgency=medium [ Sylvestre Ledru ] * Adjust the workaround for apt.llvm.org version upgrades @@ -9,10 +9,10 @@ llvm-toolchain-19 (1:19.1.0-4) UNRELEASED; urgency=medium [ Matthias Klose ] * Don't relax versioned shlibs dependencies for snapshot builds and - release versions. + prerelease versions. * libllvm19: No symlinks in the llvm-19 subdir. Closes: #1081192, #1082495. - -- Matthias Klose Wed, 18 Sep 2024 17:26:29 +0200 + -- Matthias Klose Sun, 22 Sep 2024 16:36:31 +0200 llvm-toolchain-19 (1:19.1.0-3) unstable; urgency=medium From 4428d2a59eb089a9fb3e2550bff04914113379fa Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 23 Sep 2024 13:20:45 +0200 Subject: [PATCH 213/241] Don't enable intel-pt on Ubuntu Bionic --- debian/changelog | 6 ++++++ debian/rules | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5d8ea0b3..16a0606f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium + + * Don't enable intel-pt on Ubuntu Bionic + + -- Sylvestre Ledru Mon, 23 Sep 2024 13:20:42 +0200 + llvm-toolchain-19 (1:19.1.0-4) unstable; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/rules b/debian/rules index 4b6b6da9..250d20d5 100755 --- a/debian/rules +++ b/debian/rules @@ -492,8 +492,15 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(LLDB_ARCHS))) STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_LUA=OFF PROJECTS+=;lldb endif + ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) + INTEL_PT_DISABLE_DISTRO := bionic +# Disable intel-pt on old distro, fails on bionic (too old) + ifeq (,$(filter $(DISTRO), $(INTEL_PT_DISABLE_DISTRO))) STAGE_ALL_CMAKE_EXTRA += -DLLDB_BUILD_INTEL_PT=ON -DLIBIPT_INCLUDE_PATH=/usr/include -DLIBIPT_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH) + + endif + endif LLDB_PYTHON_DISABLE_DISTRO := bionic buster From 215793dedbdc15e443605a56a564b365826776f9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 23 Sep 2024 13:41:13 +0200 Subject: [PATCH 214/241] fix typo --- debian/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16a0606f..c23ec456 100644 --- a/debian/changelog +++ b/debian/changelog @@ -249,7 +249,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental * refresh libomp5 symbol list * For the usage of -DLIBCXXABI_USE_LLVM_UNWINDER=OFF when we don't build unwind https://github.com/llvm/llvm-project/issues/77846 - * remove the unconditionnaly defined -DLIBUNWIND_USE_COMPILER_RT=ON + * remove the unconditionally defined -DLIBUNWIND_USE_COMPILER_RT=ON * Also pass -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF to libcxx-wasm32-wasi builds -- Sylvestre Ledru Thu, 25 Jan 2024 14:51:10 +0100 @@ -344,7 +344,7 @@ llvm-toolchain-18 (1:18.1.0~rc2-1) unstable; urgency=medium llvm-toolchain-18 (1:18.1.0~rc1-3) unstable; urgency=medium - * Fix previus upload, time64 is effective only in one specific place of + * Fix previous upload, time64 is effective only in one specific place of rules file * Fix some test using still clang-17 * Switch testing to 18 line @@ -381,12 +381,12 @@ llvm-toolchain-18 (1:18.1.0-rc1-1~exp1) experimental; urgency=medium llvm-toolchain-18 (1:18.1.0~++20240126095841+0991d3c7b53d-1~exp1) experimental; urgency=medium * Branching of 18 - note that it is normal that the versionning starts from 18.1 + note that it is normal that the versioning starts from 18.1 See https://discourse.llvm.org/t/rfc-name-the-first-release-from-a-branch-n-1-0-instead-of-n-0-0/75384 * refresh libomp5 symbol list * For the usage of -DLIBCXXABI_USE_LLVM_UNWINDER=OFF when we don't build unwind https://github.com/llvm/llvm-project/issues/77846 - * remove the unconditionnaly defined -DLIBUNWIND_USE_COMPILER_RT=ON + * remove the unconditionally defined -DLIBUNWIND_USE_COMPILER_RT=ON * Also pass -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF to libcxx-wasm32-wasi builds -- Sylvestre Ledru Fri, 26 Jan 2024 09:44:56 +0100 @@ -777,7 +777,7 @@ llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium [ Gianfranco Costamagna ] * Make libclang-common-16-dev arch:any (Closes: #1041455) - It was arch:all because all the code isn't arch dependant + It was arch:all because all the code isn't arch dependent However, it causes issues for cross build. So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}) instead of source @@ -7034,7 +7034,7 @@ llvm-toolchain-3.4 (1:3.4~+rc3-1) unstable; urgency=low llvm-toolchain-3.4 (1:3.4~+rc2-3) unstable; urgency=low - * Fix the bad declaration on the lldb desactivation + * Fix the bad declaration on the lldb deactivation * Also disable lldb under powerpc * Hopefully, fix lldb under Kfreebsd-* (thanks to Ed Maste if it works) From 72d0ae4dfe7b1f86d71ea09d155537ba865307af Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 23 Sep 2024 14:01:09 +0200 Subject: [PATCH 215/241] Add disabled info in the build log --- debian/changelog | 1 + debian/rules | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c23ec456..c02755ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium * Don't enable intel-pt on Ubuntu Bionic + * Add disabled info in the build log -- Sylvestre Ledru Mon, 23 Sep 2024 13:20:42 +0200 diff --git a/debian/rules b/debian/rules index 250d20d5..36d2f5fc 100755 --- a/debian/rules +++ b/debian/rules @@ -496,11 +496,11 @@ endif ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) INTEL_PT_DISABLE_DISTRO := bionic # Disable intel-pt on old distro, fails on bionic (too old) - ifeq (,$(filter $(DISTRO), $(INTEL_PT_DISABLE_DISTRO))) - STAGE_ALL_CMAKE_EXTRA += -DLLDB_BUILD_INTEL_PT=ON -DLIBIPT_INCLUDE_PATH=/usr/include -DLIBIPT_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH) - - endif - + ifeq (,$(filter $(DISTRO), $(INTEL_PT_DISABLE_DISTRO))) + STAGE_ALL_CMAKE_EXTRA += -DLLDB_BUILD_INTEL_PT=ON -DLIBIPT_INCLUDE_PATH=/usr/include -DLIBIPT_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH) + else + $(info Intel PT disabled for $(DISTRO)) + endif endif LLDB_PYTHON_DISABLE_DISTRO := bionic buster @@ -510,6 +510,7 @@ ifeq (,$(filter-out $(LLDB_PYTHON_DISABLE_DISTRO), $(DISTRO))) # Don't enable lld python for old distros STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_PYTHON=OFF LLDB_PYTHON_ENABLE=no + $(info LLBD Python disabled for $(DISTRO)) endif LIBCXX_WASM_ENABLE=yes @@ -519,6 +520,7 @@ LIBCXX_WASM_DISABLE_DISTRO := bionic buster focal bullseye jammy # https://sourceware.org/bugzilla/show_bug.cgi?id=27558 ifeq (,$(filter-out $(LIBCXX_WASM_DISABLE_DISTRO), $(DISTRO))) LIBCXX_WASM_ENABLE=no + $(info libcxx wasm disabled for $(DISTRO)) endif DOC_GENERATION=yes @@ -526,6 +528,7 @@ DOC_GENERATION_DISTRO := buster bullseye bionic focal # LLVM upstream moved to myst_parser but it isn't available on old distro ifeq (,$(filter-out $(DOC_GENERATION_DISTRO), $(DISTRO))) DOC_GENERATION=no + $(info Doc generation disabled for $(DISTRO)) endif ifneq (,$(filter $(DEB_HOST_ARCH),powerpc)) @@ -552,6 +555,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) LTO_DISABLE_ARCHS := i386 armhf s390x ppc64 x32 ifeq (,$(filter-out $(LTO_DISABLE_ARCHS), $(DEB_HOST_ARCH))) LTO_ENABLE=no + $(info LTO disabled for $(DEB_HOST_ARCH)) else # Disable for now because of # https://github.com/llvm/llvm-project/issues/58317#issuecomment-1276190743 @@ -581,6 +585,7 @@ endif LIBFUZZER_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH_OS),linux)) LIBFUZZER_ENABLE=no + $(info Libfuzzer disabled for $(DEB_HOST_ARCH_OS)) endif ifneq (,$(filter $(DEB_HOST_ARCH), mipsel)) From d7ecbb69b3a22f47499e7bf1b30eda3ad50171cb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 23 Sep 2024 14:22:41 +0200 Subject: [PATCH 216/241] Disable LLVM libc on bionic --- debian/changelog | 1 + debian/rules | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index c02755ef..1600ca65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium * Don't enable intel-pt on Ubuntu Bionic * Add disabled info in the build log + * Disable LLVM libc on bionic -- Sylvestre Ledru Mon, 23 Sep 2024 13:20:42 +0200 diff --git a/debian/rules b/debian/rules index 36d2f5fc..47eb3d2a 100755 --- a/debian/rules +++ b/debian/rules @@ -373,12 +373,13 @@ ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) endif ifneq (,$(filter libllvmlibc-$(LLVM_VERSION)-dev, $(packages))) - RUNTIMES += ;libc - LLVM_LIBC_FULL_DISTRO := bionic -# Workaround on bionic -# See https://github.com/llvm/llvm-project/issues/82467#issuecomment-2033193448 - ifeq (,$(filter-out $(LLVM_LIBC_FULL_DISTRO), $(DISTRO))) - STAGE_ALL_CMAKE_EXTRA += -DLLVM_LIBC_FULL_BUILD=ON + LLVM_LIBC_ENABLE=yes + LLVM_LIBC_DISABLE_DISTRO := bionic + ifeq (,$(filter $(DISTRO), $(LLVM_LIBC_DISABLE_DISTRO))) + RUNTIMES += ;libc + else + LLVM_LIBC_ENABLE=no + $(info LLVM libc disabled for $(DISTRO)) endif endif @@ -760,6 +761,10 @@ stamps/preconfigure: fi; \ fi + if test "$(LLVM_LIBC_ENABLE)" = "no"; then \ + echo "" > debian/libllvmlibc-$(LLVM_VERSION)-dev.install; \ + fi + # Conditionally enable install clangd grpc files if test "$(CLANGD_GRPC_INSTALLED)" = "yes"; then \ sed -i -e "s|#grpc\ ||g" debian/libclang-$(LLVM_VERSION)-dev.install; \ From d6b55c220c534a9aabf43349628bcde7abfe231d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 23 Sep 2024 14:50:16 +0200 Subject: [PATCH 217/241] fix the display of the error --- debian/rules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 47eb3d2a..02b2486f 100755 --- a/debian/rules +++ b/debian/rules @@ -379,10 +379,13 @@ ifneq (,$(filter libllvmlibc-$(LLVM_VERSION)-dev, $(packages))) RUNTIMES += ;libc else LLVM_LIBC_ENABLE=no - $(info LLVM libc disabled for $(DISTRO)) endif endif +ifneq ($(LLVM_LIBC_ENABLE),no) + $(info LLVM libc disabled for $(DISTRO)) +endif + ifneq (,$(filter $(DEB_HOST_ARCH), $(FLANG_ARCHS))) PROJECTS += ;flang endif From 7078d590d53c972cec39072e87e5889c34b6f214 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 23 Sep 2024 15:01:52 +0200 Subject: [PATCH 218/241] remove too deep info --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index 02b2486f..4e4a7f5d 100755 --- a/debian/rules +++ b/debian/rules @@ -502,8 +502,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) # Disable intel-pt on old distro, fails on bionic (too old) ifeq (,$(filter $(DISTRO), $(INTEL_PT_DISABLE_DISTRO))) STAGE_ALL_CMAKE_EXTRA += -DLLDB_BUILD_INTEL_PT=ON -DLIBIPT_INCLUDE_PATH=/usr/include -DLIBIPT_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH) - else - $(info Intel PT disabled for $(DISTRO)) endif endif From df682d9081ce937b293de2b9a1e1d68d3f38c4bf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 23 Sep 2024 16:02:11 +0200 Subject: [PATCH 219/241] fix the display of the error --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 4e4a7f5d..b83f87f0 100755 --- a/debian/rules +++ b/debian/rules @@ -566,6 +566,10 @@ else endif endif +ifneq ($(LTO_ENABLE),no) + $(info LTO disabled for $(DEB_HOST_ARCH)) +endif + # https://bugs.launchpad.net/bugs/2016471 ifeq (,$(filter-out $(LTO_DISABLE_ARCHS), $(DEB_HOST_ARCH))) LD_GOLD_SUPPORTS_NO_SYMBOLIC := $(shell ld.gold --help | grep -q -w '-Bno-symbolic' && echo "yes" || echo "no") From ab6ce75e4b165b8fba1913592214bfb135977188 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 23 Sep 2024 16:21:10 +0200 Subject: [PATCH 220/241] remove the dup warning --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index b83f87f0..1e29c85b 100755 --- a/debian/rules +++ b/debian/rules @@ -557,7 +557,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) LTO_DISABLE_ARCHS := i386 armhf s390x ppc64 x32 ifeq (,$(filter-out $(LTO_DISABLE_ARCHS), $(DEB_HOST_ARCH))) LTO_ENABLE=no - $(info LTO disabled for $(DEB_HOST_ARCH)) else # Disable for now because of # https://github.com/llvm/llvm-project/issues/58317#issuecomment-1276190743 From 2537c988d4ddcb935f356dfd598cf9d258f9701b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 25 Sep 2024 10:16:57 +0200 Subject: [PATCH 221/241] adjust the sed depending on the cmake version (i guess?) --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index 1e29c85b..e41d92a2 100755 --- a/debian/rules +++ b/debian/rules @@ -1367,27 +1367,27 @@ endif # Disable CMake's LLVMExports package validation checks for target files that we may remove. sed -i \ - -e '/_cmake_import_check_targets \(Polly\|sancov\|llvm-omp-device-info\|LibcTableGenUtil\|omptarget\|omp\)/ {s|^|#|}' \ + -e '/_\(cmake_import_check_targets\|IMPORT_CHECK_TARGETS\) \(Polly\|sancov\|llvm-omp-device-info\|LibcTableGenUtil\|omptarget\|omp\)/ {s|^|#|}' \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake # the obscure libLLVM.so.1 file ... sed -i \ - -e '/_cmake_import_check_targets LLVM/ {s|^|#|}' \ - -e '/_cmake_import_check_files_for_.*\/libLLVM\.so\.1.*/ {s|^|#|}' \ + -e '/_\(cmake_import_check_targets\|IMPORT_CHECK_TARGETS\) LLVM/ {s|^|#|}' \ + -e '/_\(cmake_import_check_targets\|IMPORT_CHECK_TARGETS\)_.*\/libLLVM\.so\.1.*/ {s|^|#|}' \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake # Also disable mlir-* checks in the cmake sed -i \ - -e '/_cmake_import_check_targets \(mlir-\|MLIR\)/ {s|^|#|}' \ + -e '/_\(cmake_import_check_targets\|IMPORT_CHECK_TARGETS\) \(mlir-\|MLIR\)/ {s|^|#|}' \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake sed -i \ - -e '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}' \ + -e '/_\(cmake_import_check_files_for\|IMPORT_CHECK_FILES_FOR\)_.*\/bin\/.*/ {s|^|#|}' \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i \ - -e '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|LibcTableGenUtil\|omp\|omptarget\)/ {s|^|#|}' \ + -e '/_\(cmake_import_check_files_for\|IMPORT_CHECK_FILES_FOR\)_\(mlir\|Polly\|MLIR\|LibcTableGenUtil\|omp\|omptarget\)/ {s|^|#|}' \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake From f85f853fd0f3ab09e890bd573f00be248136f16d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 30 Sep 2024 22:28:34 +0200 Subject: [PATCH 222/241] Fix the bootstrapping (Closes: #1082610) Thanks to Andrey Feofilaktov for the patch --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1600ca65..84b929ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium * Don't enable intel-pt on Ubuntu Bionic * Add disabled info in the build log * Disable LLVM libc on bionic + * Fix the bootstrapping (Closes: #1082610) + Thanks to Andrey Feofilaktov for the patch -- Sylvestre Ledru Mon, 23 Sep 2024 13:20:42 +0200 diff --git a/debian/control b/debian/control index 0f6e8992..fe5e279d 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled llvm-spirv-19 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , - spirv-tools [linux-any] | hello [linux-any], + spirv-tools [linux-any] | hello [linux-any] , wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev , libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , From 64a3b94330f62eae524154ff55abd4c0b8dcdce1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 30 Sep 2024 22:29:52 +0200 Subject: [PATCH 223/241] upgrade the control.in too --- debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control.in b/debian/control.in index 933e8cb5..9053c1fd 100644 --- a/debian/control.in +++ b/debian/control.in @@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled llvm-spirv-19 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] , - spirv-tools [linux-any] | hello [linux-any], + spirv-tools [linux-any] | hello [linux-any] , wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev , libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , From df45eae76e531006db19a3d2f9468c627c186069 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 30 Sep 2024 22:32:58 +0200 Subject: [PATCH 224/241] clang provides objc++-compiler (Closes: #1082744) --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 84b929ed..0308f5dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium * Disable LLVM libc on bionic * Fix the bootstrapping (Closes: #1082610) Thanks to Andrey Feofilaktov for the patch + * clang provides objc++-compiler (Closes: #1082744) -- Sylvestre Ledru Mon, 23 Sep 2024 13:20:42 +0200 diff --git a/debian/control b/debian/control index fe5e279d..b51028a4 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang-common-19-dev (= ${binary:Version}), llvm-19-linker-tools (= ${binary:Version}), libclang1-19 (= ${binary:Version}), libc6-dev, binutils -Provides: c-compiler, objc-compiler, c++-compiler +Provides: c-compiler, objc-compiler, c++-compiler, objc++-compiler Recommends: llvm-19-dev, python3 # libomp-19-dev Suggests: clang-19-doc, wasi-libc diff --git a/debian/control.in b/debian/control.in index 9053c1fd..560b99aa 100644 --- a/debian/control.in +++ b/debian/control.in @@ -51,7 +51,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}), libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils -Provides: c-compiler, objc-compiler, c++-compiler +Provides: c-compiler, objc-compiler, c++-compiler, objc++-compiler Recommends: llvm-@LLVM_VERSION@-dev, python3 # libomp-@LLVM_VERSION@-dev Suggests: clang-@LLVM_VERSION@-doc, wasi-libc From d11668c6e7fdebcd67a3e51c9cbafb8baecf49a8 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 2 Oct 2024 06:10:53 +0200 Subject: [PATCH 225/241] [ Matthias Klose ] * Update watch file and add .git* files to exclude in the tarball. --- debian/changelog | 8 ++++++-- debian/copyright | 3 ++- debian/watch | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0308f5dc..2eea3da5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium +llvm-toolchain-19 (1:19.1.0-5) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * Don't enable intel-pt on Ubuntu Bionic * Add disabled info in the build log * Disable LLVM libc on bionic @@ -7,7 +8,10 @@ llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium Thanks to Andrey Feofilaktov for the patch * clang provides objc++-compiler (Closes: #1082744) - -- Sylvestre Ledru Mon, 23 Sep 2024 13:20:42 +0200 + [ Matthias Klose ] + * Update watch file and add .git* files to exclude in the tarball. + + -- Matthias Klose Wed, 02 Oct 2024 06:08:02 +0200 llvm-toolchain-19 (1:19.1.0-4) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 853eb278..8fef1e75 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: LLVM/Clang -Source: https://llvm.org/releases/download.html +Source: https://github.com/llvm/llvm-project +Files-Excluded: .github .gitattributes .git-blame-ignore-revs .gitignore Files: * Copyright: 2003-2017 University of Illinois at Urbana-Champaign. diff --git a/debian/watch b/debian/watch index abd072ff..9223afde 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,15 @@ version=4 -https://llvm.org/releases/download.html .*/llvm-([\d\.\-]+).src.tar.xz +opts=repack,compression=xz, \ + https://github.com/llvm/llvm-project/tags \ + (?:.*?/)?llvmorg-(19[\d\.\-]+).tar.gz + +# FIXME: doesn't work yet: +# Newest version of integration-test-suite on remote site is 0.0~git20240518.a962677, local version is 19.1.1 +#opts=\ +#component=integration-test-suite,\ +#mode=git,\ +#pgpmode=none,\ +#repack,\ +#compression=xz \ +# https://github.com/opencollab/llvm-toolchain-integration-test-suite \ +# HEAD From 1bbc19cbfb66b4a05dd1b34ec02931f8975eef63 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 10 Sep 2024 00:57:59 +0200 Subject: [PATCH 226/241] =?UTF-8?q?patches/hurd/hurd-f=5Ftype.diff:=20Fix?= =?UTF-8?q?=20hurd=20build=20against=20glibc=20=E2=89=A5=202.39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 3 +++ debian/patches/hurd/hurd-f_type.diff | 27 +++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/hurd/hurd-f_type.diff diff --git a/debian/changelog b/debian/changelog index 2eea3da5..724a99c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ llvm-toolchain-19 (1:19.1.0-5) UNRELEASED; urgency=medium [ Matthias Klose ] * Update watch file and add .git* files to exclude in the tarball. + [ Samuel Thibault ] + * patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39. + -- Matthias Klose Wed, 02 Oct 2024 06:08:02 +0200 llvm-toolchain-19 (1:19.1.0-4) unstable; urgency=medium diff --git a/debian/patches/hurd/hurd-f_type.diff b/debian/patches/hurd/hurd-f_type.diff new file mode 100644 index 00000000..f73077af --- /dev/null +++ b/debian/patches/hurd/hurd-f_type.diff @@ -0,0 +1,27 @@ +https://github.com/llvm/llvm-project/pull/71851 + +commit 620b8d994b8abdcf31271d9f4db7e7422fc9bd65 +Author: Samuel Thibault +Date: Mon Sep 9 15:53:33 2024 +0200 + + [hurd] Fix accessing f_type field of statvfs (#71851) + + f4719c4d2cda ("Add support for GNU Hurd in Path.inc and other places") + made llvm use an internal __f_type name for the f_type field (which it + is not supposed to since accessing double-underscore names is explicitly + not supported by standards). In glibc 2.39 this field was renamed to + f_type so application can now access the field as the standard says. + +diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc +index 8098392a7fd9..44097bad7b46 100644 +--- a/llvm/lib/Support/Unix/Path.inc ++++ b/llvm/lib/Support/Unix/Path.inc +@@ -487,7 +487,7 @@ static bool is_local_impl(struct STATVFS &Vfs) { + #ifndef CIFS_MAGIC_NUMBER + #define CIFS_MAGIC_NUMBER 0xFF534D42 + #endif +-#ifdef __GNU__ ++#if defined(__GNU__) && ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 39))) + switch ((uint32_t)Vfs.__f_type) { + #else + switch ((uint32_t)Vfs.f_type) { diff --git a/debian/patches/series b/debian/patches/series index 6d0bbe62..181f57a6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -90,6 +90,7 @@ remove-apple-clang-manpage.diff # Hurd port hurd/hurd-pathmax.diff +hurd/hurd-f_type.diff 930008-arm.diff bootstrap-fix-include-next.diff From ba7106599f401605ffe5a3954e54a4cd61edcf12 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 31 Jul 2024 10:35:57 +0200 Subject: [PATCH 227/241] Fix hurd-amd64 support --- debian/changelog | 6 +++++- debian/libomp-X.Y-dev.install.in | 14 +++++++------- debian/libomp5-X.Y.install.in | 2 +- debian/libomp5-X.Y.symbols.in | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 724a99c4..8631ca71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0-5) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium [ Sylvestre Ledru ] * Don't enable intel-pt on Ubuntu Bionic @@ -13,6 +13,10 @@ llvm-toolchain-19 (1:19.1.0-5) UNRELEASED; urgency=medium [ Samuel Thibault ] * patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39. + * libomp-X.Y-dev.install.in: Don't try to ship ompd gdb plugin on + hurd-amd64 ; ship libomptarget. + * libomp5-X.Y.install.in: Ship libomptarget. + * libomp5-X.Y.symbols.in: Fix symbols on hurd-any. -- Matthias Klose Wed, 02 Oct 2024 06:08:02 +0200 diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in index ff72a7d7..2171a9f2 100644 --- a/debian/libomp-X.Y-dev.install.in +++ b/debian/libomp-X.Y-dev.install.in @@ -7,16 +7,16 @@ [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so -[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a +[amd64 hurd-amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a -[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc +[amd64 hurd-amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake -[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info -[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay +[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info +[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay -[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@ -[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@ +[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@ +[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@ -[!armhf] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/ +[!armhf !hurd-amd64] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/ diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Y.install.in index ca0c38ca..d939820a 100644 --- a/debian/libomp5-X.Y.install.in +++ b/debian/libomp5-X.Y.install.in @@ -1,5 +1,5 @@ #!/usr/bin/dh-exec usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5 -[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ +[amd64 hurd-amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in index 25ac2195..258fb40d 100644 --- a/debian/libomp5-X.Y.symbols.in +++ b/debian/libomp5-X.Y.symbols.in @@ -1008,7 +1008,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# kmp_set_stacksize_@VERSION 0.20130412 kmp_set_stacksize_s@VERSION 0.20130412 kmp_set_stacksize_s_@VERSION 0.20130412 - (arch=!ppc64 !ppc64el)kmp_set_thread_affinity_mask_initial@VERSION 3.8.0 + (arch=!ppc64 !ppc64el !hurd-any)kmp_set_thread_affinity_mask_initial@VERSION 3.8.0 kmp_set_warnings_off@VERSION 0.20130412 kmp_set_warnings_off_@VERSION 0.20130412 kmp_set_warnings_on@VERSION 0.20130412 From 7a2a234e18e7f3320086b63f331be3fc889d92d9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 2 Oct 2024 10:29:47 +0200 Subject: [PATCH 228/241] fix the changelog --- debian/changelog | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8631ca71..d00d90d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +llvm-toolchain-19 (1:19.1.0-6) unstable; urgency=medium + + [ Samuel Thibault ] + * patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39. + * libomp-X.Y-dev.install.in: Don't try to ship ompd gdb plugin on + hurd-amd64 ; ship libomptarget. + * libomp5-X.Y.install.in: Ship libomptarget. + * libomp5-X.Y.symbols.in: Fix symbols on hurd-any. + + -- Sylvestre Ledru Wed, 02 Oct 2024 10:29:32 +0200 + llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium [ Sylvestre Ledru ] @@ -11,14 +22,7 @@ llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium [ Matthias Klose ] * Update watch file and add .git* files to exclude in the tarball. - [ Samuel Thibault ] - * patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39. - * libomp-X.Y-dev.install.in: Don't try to ship ompd gdb plugin on - hurd-amd64 ; ship libomptarget. - * libomp5-X.Y.install.in: Ship libomptarget. - * libomp5-X.Y.symbols.in: Fix symbols on hurd-any. - - -- Matthias Klose Wed, 02 Oct 2024 06:08:02 +0200 + -- Sylvestre Ledru Wed, 02 Oct 2024 10:29:26 +0200 llvm-toolchain-19 (1:19.1.0-4) unstable; urgency=medium From 1ebd80e92e4bbb03dd250995bba08823e7b0bfca Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 2 Oct 2024 11:20:18 +0200 Subject: [PATCH 229/241] fix the changelog --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d00d90d9..b3e26c0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.0-6) unstable; urgency=medium +llvm-toolchain-19 (1:19.1.1-2) unstable; urgency=medium [ Samuel Thibault ] * patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39. @@ -9,7 +9,7 @@ llvm-toolchain-19 (1:19.1.0-6) unstable; urgency=medium -- Sylvestre Ledru Wed, 02 Oct 2024 10:29:32 +0200 -llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium +llvm-toolchain-19 (1:19.1.1-1) unstable; urgency=medium [ Sylvestre Ledru ] * Don't enable intel-pt on Ubuntu Bionic @@ -20,9 +20,10 @@ llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium * clang provides objc++-compiler (Closes: #1082744) [ Matthias Klose ] + * New upstream release * Update watch file and add .git* files to exclude in the tarball. - -- Sylvestre Ledru Wed, 02 Oct 2024 10:29:26 +0200 + -- Matthias Klose Wed, 02 Oct 2024 06:11:01 +0200 llvm-toolchain-19 (1:19.1.0-4) unstable; urgency=medium From 60f68772c567a85273c3a9002c8320513ccacb79 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 3 Oct 2024 20:04:08 +0200 Subject: [PATCH 230/241] rules: Fix syntax on non-linux Make does not want a tab before a $(info), see https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-19&arch=hurd-i386&ver=1%3A19.1.1-1&stamp=1727930867&raw=0 --- debian/changelog | 3 ++- debian/rules | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3e26c0a..54479af2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-19 (1:19.1.1-2) unstable; urgency=medium +llvm-toolchain-19 (1:19.1.1-2) UNRELEASED; urgency=medium [ Samuel Thibault ] * patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39. @@ -6,6 +6,7 @@ llvm-toolchain-19 (1:19.1.1-2) unstable; urgency=medium hurd-amd64 ; ship libomptarget. * libomp5-X.Y.install.in: Ship libomptarget. * libomp5-X.Y.symbols.in: Fix symbols on hurd-any. + * rules: Fix syntax on non-linux. -- Sylvestre Ledru Wed, 02 Oct 2024 10:29:32 +0200 diff --git a/debian/rules b/debian/rules index e41d92a2..5e4aba68 100755 --- a/debian/rules +++ b/debian/rules @@ -590,7 +590,7 @@ endif LIBFUZZER_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH_OS),linux)) LIBFUZZER_ENABLE=no - $(info Libfuzzer disabled for $(DEB_HOST_ARCH_OS)) + $(info Libfuzzer disabled for $(DEB_HOST_ARCH_OS)) endif ifneq (,$(filter $(DEB_HOST_ARCH), mipsel)) From f58880852a2e2247e493c82df609bcacf9d47602 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 5 Oct 2024 08:30:06 +0200 Subject: [PATCH 231/241] Update Standards version to 4.7.0 --- debian/changelog | 2 ++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54479af2..c7480c40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ llvm-toolchain-19 (1:19.1.1-2) UNRELEASED; urgency=medium + * Update Standards version to 4.7.0 + [ Samuel Thibault ] * patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39. * libomp-X.Y-dev.install.in: Don't try to ship ompd gdb plugin on diff --git a/debian/control b/debian/control index b51028a4..bee671a3 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , Build-Conflicts: oprofile -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 19 Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/19 diff --git a/debian/control.in b/debian/control.in index 560b99aa..f6ca0b64 100644 --- a/debian/control.in +++ b/debian/control.in @@ -36,7 +36,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , Build-Conflicts: oprofile -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b @BRANCH_NAME@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_NAME@ From af6609c5b3a2729087cc9fdacf591403ab892e19 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 9 Oct 2024 20:04:05 +0200 Subject: [PATCH 232/241] Don't try to install xray and profile headers on powerpc --- debian/changelog | 3 +++ debian/libclang-common-X.Y-dev.install.in | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c7480c40..07cb669f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ llvm-toolchain-19 (1:19.1.1-2) UNRELEASED; urgency=medium * libomp5-X.Y.symbols.in: Fix symbols on hurd-any. * rules: Fix syntax on non-linux. + [ John Paul Adrian Glaubitz ] + * Don't try to install xray and profile headers on powerpc + -- Sylvestre Ledru Wed, 02 Oct 2024 10:29:32 +0200 llvm-toolchain-19 (1:19.1.1-1) unstable; urgency=medium diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 571a6619..f3cbb39e 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -2,8 +2,8 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap -[!armel !armhf !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ -[!armel !armhf !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/ +[!armel !armhf !powerpc !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ +[!armel !armhf !powerpc !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/ From fc2f621daba2092b4625c2af3c77d3d57dd5edc8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 11 Oct 2024 21:42:16 +0200 Subject: [PATCH 233/241] rebase of the patches --- ...-html_static_path-_static-everywhere.patch | 20 +++---- .../23-strlcpy_strlcat_warning_removed.diff | 48 ++++++++--------- debian/patches/clang-tidy-run-bin.diff | 8 +-- debian/patches/clangd-atomic-cmake.patch | 8 +-- debian/patches/fix-clang-path-and-build.diff | 8 +-- debian/patches/hurd/hurd-pathmax.diff | 14 ++--- .../libclc-fix-prepare_builtins-rpath.diff | 8 +-- debian/patches/libcxx/libcxx-armhf-ftbfs.diff | 10 ++-- .../libcxx-libatomic-only-with-gcc-rtlib.diff | 8 +-- ...bcxx-test-fix-lockfree-test-for-i386.patch | 8 +-- .../libcxx/libcxxabi-arm-ehabi-fix.patch | 20 +++---- ...test-don-t-fail-extended-long-double.patch | 8 +-- debian/patches/lldb/lldb-missing-install.diff | 14 ++--- debian/patches/lldb/lldb-soname.diff | 10 ++-- debian/patches/lldb/print-lldb-path.patch | 14 ++--- debian/patches/lower-python-dep.diff | 8 +-- debian/patches/mips/mips-D101773-reloc.patch | 8 +-- debian/patches/mips/mips-fpxx-enable.diff | 10 ++-- debian/patches/openmp-fix-runtimes-build.diff | 52 +++++++++---------- debian/patches/openmp-soname.diff | 8 +-- debian/patches/python-clangpath.diff | 8 +-- .../patches/remove-apple-clang-manpage.diff | 8 +-- debian/patches/symbolizer-path.diff | 14 ++--- 23 files changed, 161 insertions(+), 161 deletions(-) diff --git a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch index 68e95358..522b4c85 100644 --- a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch +++ b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch @@ -9,10 +9,10 @@ Subject: Set html_static_path = ['_static'] everywhere. polly/docs/conf.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analyzer/conf.py +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/analyzer/conf.py @@ -118,7 +118,7 @@ html_theme = "haiku" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, @@ -22,11 +22,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/analy # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf.py -@@ -118,7 +118,7 @@ html_theme = "haiku" +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/docs/conf.py ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/conf.py +@@ -127,7 +127,7 @@ html_theme = "haiku" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". @@ -35,10 +35,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/docs/conf. # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/polly/docs/conf.py +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/polly/docs/conf.py ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/polly/docs/conf.py @@ -124,7 +124,7 @@ except ImportError: # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 6e9c9a59..fc63d8ea 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,11 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/AST/Decl.cpp -@@ -4426,13 +4426,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/AST/Decl.cpp +@@ -4412,13 +4412,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -31,11 +31,11 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/SemaChecking.cpp -@@ -1320,8 +1320,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Sema/SemaChecking.cpp +@@ -1348,8 +1348,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memset_chk: @@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -8179,10 +8179,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -3422,10 +3422,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -59,11 +59,11 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -741,9 +741,9 @@ void GenericTaintChecker::initTaintRules +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -743,9 +743,9 @@ void GenericTaintChecker::initTaintRules TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, {{CDM::CLibraryMaybeHardened, {"strncat"}}, TR::Prop({{0, 1, 2}}, {{0, ReturnValueIndex}})}, @@ -75,10 +75,10 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/lib/Static // Usually the matching mode `CDM::CLibraryMaybeHardened` is sufficient // for unified handling of a function `FOO()` and its hardened variant // `__FOO_chk()`, but in the "sprintf" family the extra parameters of the -Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/builtins.c +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/builtins.c +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -110,10 +110,10 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -170,11 +170,11 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} -Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/include/clang/Basic/Builtins.td +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/include/clang/Basic/Builtins.td =================================================================== ---- llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff.orig/clang/include/clang/Basic/Builtins.td -+++ llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/include/clang/Basic/Builtins.td -@@ -3274,7 +3274,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/include/clang/Basic/Builtins.td +@@ -3316,7 +3316,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h // non-standard but very common @@ -184,7 +184,7 @@ Index: llvm-toolchain-snapshot_19~++20240517090803+37d00635c4ff/clang/include/cl let Spellings = ["strlcpy"]; let Prototype = "size_t(char*, char const*, size_t)"; } -@@ -3283,6 +3284,7 @@ def StrlCat : GNULibBuiltin<"string.h"> +@@ -3325,6 +3326,7 @@ def StrlCat : GNULibBuiltin<"string.h"> let Spellings = ["strlcat"]; let Prototype = "size_t(char*, char const*, size_t)"; } diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff index 814c603e..dc1d5442 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240626095617+515e048e36d9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240626095617+515e048e36d9.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-snapshot_19~++20240626095617+515e048e36d9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -@@ -264,10 +264,12 @@ def main(): +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +@@ -300,10 +300,12 @@ async def main() -> None: help="Allow alpha checkers from clang-analyzer.", ) parser.add_argument( diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch index 51860c8e..e4184b50 100644 --- a/debian/patches/clangd-atomic-cmake.patch +++ b/debian/patches/clangd-atomic-cmake.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang-tools-extra/clangd/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/clangd/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang-tools-extra/clangd/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang-tools-extra/clangd/CMakeLists.txt @@ -61,6 +61,11 @@ endif() include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy") include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../include-cleaner/include") @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extr add_clang_library(clangDaemon AST.cpp ASTSignals.cpp -@@ -178,6 +183,7 @@ clang_target_link_libraries(clangDaemon +@@ -181,6 +186,7 @@ clang_target_link_libraries(clangDaemon target_link_libraries(clangDaemon PRIVATE ${LLVM_PTHREAD_LIB} diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff index 689f07db..252aa5c5 100644 --- a/debian/patches/fix-clang-path-and-build.diff +++ b/debian/patches/fix-clang-path-and-build.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Driver/ToolChains/Linux.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/Linux.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/Linux.cpp +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Driver/ToolChains/Linux.cpp @@ -13,6 +13,7 @@ #include "Arch/PPC.h" #include "Arch/RISCV.h" @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver #include "clang/Config/config.h" #include "clang/Driver/Distro.h" #include "clang/Driver/Driver.h" -@@ -627,8 +628,18 @@ void Linux::AddClangSystemIncludeArgs(co +@@ -634,8 +635,18 @@ void Linux::AddClangSystemIncludeArgs(co SmallString<128> ResourceDirInclude(D.ResourceDir); llvm::sys::path::append(ResourceDirInclude, "include"); if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff index d0633ec9..49f7fb53 100644 --- a/debian/patches/hurd/hurd-pathmax.diff +++ b/debian/patches/hurd/hurd-pathmax.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/FileManager.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Basic/FileManager.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Basic/FileManager.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/FileManager.cpp -@@ -592,6 +592,12 @@ FileManager::getNoncachedStatValue(Strin +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/Basic/FileManager.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Basic/FileManager.cpp +@@ -609,6 +609,12 @@ FileManager::getNoncachedStatValue(Strin return std::error_code(); } @@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Basic/ void FileManager::GetUniqueIDMapping( SmallVectorImpl &UIDToFiles) const { UIDToFiles.clear(); -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/include/lldb/lldb-defines.h +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/include/lldb/lldb-defines.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/include/lldb/lldb-defines.h -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/include/lldb/lldb-defines.h +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/include/lldb/lldb-defines.h ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/include/lldb/lldb-defines.h @@ -15,6 +15,11 @@ #define INT32_MAX 2147483647 #endif diff --git a/debian/patches/libclc-fix-prepare_builtins-rpath.diff b/debian/patches/libclc-fix-prepare_builtins-rpath.diff index e50abb9b..e5dc91ea 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_19~++20240711013116+0ff13f72c974/libclc/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libclc/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/libclc/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/libclc/CMakeLists.txt -@@ -176,6 +176,9 @@ endif() +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libclc/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libclc/CMakeLists.txt +@@ -177,6 +177,9 @@ endif() target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) # These were not properly reported in early LLVM and we don't need them target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) diff --git a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff index 8d2e078e..612394c5 100644 --- a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff +++ b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/__atomic/aliases.h +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/include/__atomic/aliases.h =================================================================== ---- llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5.orig/libcxx/include/__atomic/aliases.h -+++ llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/__atomic/aliases.h -@@ -96,6 +96,7 @@ using __largest_lock_free_type = char; +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxx/include/__atomic/aliases.h ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/include/__atomic/aliases.h +@@ -95,6 +95,7 @@ using __largest_lock_free_type = char; # endif # ifndef _LIBCPP_NO_LOCK_FREE_TYPES @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/_ using __contention_t_or_largest = __conditional_t<__libcpp_is_always_lock_free<__cxx_contention_t>::__value, __cxx_contention_t, -@@ -105,6 +106,8 @@ using atomic_signed_lock_free = atomic +@@ -104,6 +105,8 @@ using atomic_signed_lock_free = atomic using atomic_unsigned_lock_free = atomic>; # endif // !_LIBCPP_NO_LOCK_FREE_TYPES #endif // C++20 diff --git a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff index 5fde6eb6..191ac033 100644 --- a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff +++ b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff @@ -1,9 +1,9 @@ if libatomic is found only link it if libgcc is the rtlib -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxx/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxx/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxx/CMakeLists.txt -@@ -691,13 +691,16 @@ function(cxx_link_system_libraries targe +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxx/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/CMakeLists.txt +@@ -693,13 +693,16 @@ function(cxx_link_system_libraries targe endif() elseif (LIBCXX_HAS_GCC_LIB) target_link_libraries(${target} PRIVATE gcc) diff --git a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch index 44c531ec..ff676973 100644 --- a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch +++ b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch @@ -10,11 +10,11 @@ To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 defi Bug: https://llvm.org/bugs/show_bug.cgi?id=19355 -Index: llvm-toolchain-snapshot_20~++20240727010229+4f5ad22b95ba/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_20~++20240727010229+4f5ad22b95ba.orig/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.cpp -+++ llvm-toolchain-snapshot_20~++20240727010229+4f5ad22b95ba/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.cpp -@@ -22,6 +22,14 @@ +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.pass.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxx/test/std/atomics/atomics.lockfree/is_always_lock_free.pass.cpp +@@ -27,6 +27,14 @@ #include "test_macros.h" #include "atomic_helpers.h" diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch index 8c352ac6..f2e30bab 100644 --- a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch +++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch @@ -7,11 +7,11 @@ sure their ABI stays in sync. No known upstream bug about this. -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/src/cxa_exception.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/cxa_exception.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.cpp -@@ -286,15 +286,16 @@ __cxa_throw(void *thrown_object, std::ty +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxxabi/src/cxa_exception.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/src/cxa_exception.cpp +@@ -291,15 +291,16 @@ __cxa_throw(void *thrown_object, std::ty #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); @@ -30,7 +30,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cx // 2.5.3 Exception Handlers /* The adjusted pointer is computed by the personality routine during phase 1 -@@ -578,7 +579,11 @@ void __cxa_end_catch() { +@@ -583,7 +584,11 @@ void __cxa_end_catch() { // to touch a foreign exception in any way, that is undefined // behavior. They likely can't since the only way to catch // a foreign exception is with catch (...)! @@ -42,7 +42,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cx globals->caughtExceptions = 0; } } -@@ -635,8 +640,10 @@ void __cxa_rethrow() { +@@ -645,8 +650,10 @@ void __cxa_rethrow() { } #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); @@ -54,7 +54,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cx #endif // If we get here, some kind of unwinding error has occurred. -@@ -760,8 +767,10 @@ __cxa_rethrow_primary_exception(void* th +@@ -770,8 +777,10 @@ __cxa_rethrow_primary_exception(void* th dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup; #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader); @@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cx #endif // Some sort of unwinding error. Note that terminate is a handler. __cxa_begin_catch(&dep_exception_header->unwindHeader); -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.h +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/src/cxa_exception.h =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/libcxxabi/src/cxa_exception.h -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/libcxxabi/src/cxa_exception.h +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxxabi/src/cxa_exception.h ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/src/cxa_exception.h @@ -27,6 +27,45 @@ _LIBCXXABI_HIDDEN uint64_t __getExceptio _LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint64_t); _LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); diff --git a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch index 02f5b1eb..4a046e16 100644 --- a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch +++ b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch @@ -2,11 +2,11 @@ Powerpc has extended double that doesn't match x86 coding. Power format would need special tests to verify correctness but for now it is enough to prevent incorrect test from running. -Index: llvm-toolchain-snapshot_19~++20240228110413+ba692301f169/libcxxabi/test/test_demangle.pass.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/test/test_demangle.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240228110413+ba692301f169.orig/libcxxabi/test/test_demangle.pass.cpp -+++ llvm-toolchain-snapshot_19~++20240228110413+ba692301f169/libcxxabi/test/test_demangle.pass.cpp -@@ -30239,7 +30239,7 @@ const char* invalid_cases[] = +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/libcxxabi/test/test_demangle.pass.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/libcxxabi/test/test_demangle.pass.cpp +@@ -30235,7 +30235,7 @@ const char* invalid_cases[] = "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_", "3FooILdaaaaaaaaaaAAAAaaEE", "3FooILdaaaaaaaaaaaaaaEE", diff --git a/debian/patches/lldb/lldb-missing-install.diff b/debian/patches/lldb/lldb-missing-install.diff index 78f96947..029f2d1d 100644 --- a/debian/patches/lldb/lldb-missing-install.diff +++ b/debian/patches/lldb/lldb-missing-install.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/tools/argdumper/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/argdumper/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/tools/argdumper/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/tools/argdumper/CMakeLists.txt @@ -6,3 +6,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM ) @@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdu + +install(TARGETS lldb-argdumper + RUNTIME DESTINATION bin) -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/tools/lldb-server/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/lldb-server/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt -@@ -68,3 +68,7 @@ add_dependencies(lldb-server +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/tools/lldb-server/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/tools/lldb-server/CMakeLists.txt +@@ -67,3 +67,7 @@ add_dependencies(lldb-server ) target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source") target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS}) diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff index a5f73586..8a8cefa1 100644 --- a/debian/patches/lldb/lldb-soname.diff +++ b/debian/patches/lldb/lldb-soname.diff @@ -2,10 +2,10 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/source/API/CMakeLists.txt @@ -40,7 +40,12 @@ add_custom_target(lldb-sbapi-dwarf-enums DEPENDS ${sb_languages_file}) set_target_properties(lldb-sbapi-dwarf-enums PROPERTIES FOLDER "LLDB/Tablegenning") @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/ SBAddress.cpp SBAddressRange.cpp SBAddressRangeList.cpp -@@ -194,7 +199,7 @@ endif() +@@ -195,7 +200,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240528111735+bbca20f0b1ab/lldb/source/API/ ) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) -@@ -258,12 +263,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) +@@ -259,12 +264,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) add_llvm_symbol_exports(liblldb ${exported_symbol_file}) endif() diff --git a/debian/patches/lldb/print-lldb-path.patch b/debian/patches/lldb/print-lldb-path.patch index 372d88fb..70019803 100644 --- a/debian/patches/lldb/print-lldb-path.patch +++ b/debian/patches/lldb/print-lldb-path.patch @@ -1,10 +1,10 @@ Author: Gianfranco Costamagna Last-Update: 2023-01-19 -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/python/get-python-config.py +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/bindings/python/get-python-config.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/bindings/python/get-python-config.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/python/get-python-config.py +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/bindings/python/get-python-config.py ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/bindings/python/get-python-config.py @@ -16,6 +16,7 @@ def relpath_nodots(path, base): @@ -34,11 +34,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/bindings/py except ValueError: # Try to fall back to something reasonable if sysconfig's platlib # is outside of sys.prefix -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -@@ -260,6 +260,7 @@ void ScriptInterpreterPython::ComputePyt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +@@ -261,6 +261,7 @@ void ScriptInterpreterPython::ComputePyt // the real python interpreter uses. (e.g. lib for most, lib64 on RHEL // x86_64, or bin on Windows). llvm::sys::path::remove_filename(path); diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index 74897676..0e20b0f1 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240608033056+d4eed43badfc/llvm/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240608033056+d4eed43badfc.orig/llvm/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240608033056+d4eed43badfc/llvm/CMakeLists.txt -@@ -904,7 +904,7 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/CMakeLists.txt +@@ -932,7 +932,7 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH if(LLVM_INCLUDE_TESTS) # All LLVM Python files should be compatible down to this minimum version. diff --git a/debian/patches/mips/mips-D101773-reloc.patch b/debian/patches/mips/mips-D101773-reloc.patch index 15971c17..6403e632 100644 --- a/debian/patches/mips/mips-D101773-reloc.patch +++ b/debian/patches/mips/mips-D101773-reloc.patch @@ -24,11 +24,11 @@ Differential Revision: https://reviews.llvm.org/D101773 2 files changed, 33 insertions(+) create mode 100644 llvm/test/MC/Mips/mips_lo16.s -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/MC/ELFObjectWriter.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/lib/MC/ELFObjectWriter.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/lib/MC/ELFObjectWriter.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/lib/MC/ELFObjectWriter.cpp -@@ -1412,6 +1412,17 @@ bool ELFObjectWriter::shouldRelocateWith +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/llvm/lib/MC/ELFObjectWriter.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/lib/MC/ELFObjectWriter.cpp +@@ -1293,6 +1293,17 @@ bool ELFObjectWriter::shouldRelocateWith if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS && !hasRelocationAddend()) return true; diff --git a/debian/patches/mips/mips-fpxx-enable.diff b/debian/patches/mips/mips-fpxx-enable.diff index 3d5ec7a4..d6bef44e 100644 --- a/debian/patches/mips/mips-fpxx-enable.diff +++ b/debian/patches/mips/mips-fpxx-enable.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/Mips/MipsSubtarget.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/lib/Target/Mips/MipsSubtarget.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp -+++ llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/Mips/MipsSubtarget.cpp +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/lib/Target/Mips/MipsSubtarget.cpp @@ -81,7 +81,7 @@ MipsSubtarget::MipsSubtarget(const Tripl InMips16HardFloat(Mips16HardFloat), InMicroMipsMode(false), HasDSP(false), HasDSPR2(false), HasDSPR3(false), AllowMixed16_32(Mixed16_32 || Mips_Os16), @@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/ // MIPS-I has not been tested. if (MipsArchVersion == Mips1 && !MIPS1WarningPrinted) { errs() << "warning: MIPS-I support is experimental\n"; -@@ -242,6 +245,7 @@ MipsSubtarget & +@@ -241,6 +244,7 @@ MipsSubtarget & MipsSubtarget::initializeSubtargetDependencies(StringRef CPU, StringRef FS, const TargetMachine &TM) { StringRef CPUName = MIPS_MC::selectMipsCPU(TM.getTargetTriple(), CPU); @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240320055945+25d61be8a5e5/llvm/lib/Target/ // Parse features string. ParseSubtargetFeatures(CPUName, /*TuneCPU*/ CPUName, FS); -@@ -264,6 +268,13 @@ MipsSubtarget::initializeSubtargetDepend +@@ -263,6 +267,13 @@ MipsSubtarget::initializeSubtargetDepend report_fatal_error("64-bit code requested on a subtarget that doesn't " "support it!"); diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index f24ff87b..f803169c 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -1,11 +1,11 @@ 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 -Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CMakeLists.txt -@@ -249,6 +249,7 @@ function(runtime_default_target) +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/llvm/runtimes/CMakeLists.txt +@@ -261,6 +261,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} -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS} @@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/llvm/runtimes/CM -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -625,7 +626,7 @@ if(build_runtimes) +@@ -637,7 +638,7 @@ if(build_runtimes) # build directory cannot find the C++ headers in certain configurations. # I need to build a mechanism for runtime projects to provide CMake code # that executes at LLVM configuration time to handle this case. @@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/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_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/CMakeLists.txt @@ -122,6 +122,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -55,20 +55,20 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/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_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/cuda/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/offload/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/plugins-nextgen/cuda/CMakeLists.txt @@ -26,3 +26,5 @@ else() message(STATUS "Not generating NVIDIA tests, no supported devices detected." " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() + +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) -Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/offload/src/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/src/CMakeLists.txt @@ -38,6 +38,9 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY @@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/src/CMak target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR} ) -Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/CMakeLists.txt @@ -326,6 +326,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/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_19~++20240711013116+0ff13f72c974/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/src/CMakeLists.txt @@ -151,6 +151,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -115,10 +115,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/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_19~++20240711013116+0ff13f72c974/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/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) @@ -129,10 +129,10 @@ Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) -Index: llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/host/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/plugins-nextgen/host/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974.orig/offload/plugins-nextgen/host/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240711013116+0ff13f72c974/offload/plugins-nextgen/host/CMakeLists.txt +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/offload/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/offload/plugins-nextgen/host/CMakeLists.txt @@ -27,6 +27,8 @@ else() target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) endif() diff --git a/debian/patches/openmp-soname.diff b/debian/patches/openmp-soname.diff index 5631696c..fb0c3310 100644 --- a/debian/patches/openmp-soname.diff +++ b/debian/patches/openmp-soname.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/openmp/runtime/CMakeLists.txt -@@ -411,7 +411,8 @@ else() +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/openmp/runtime/CMakeLists.txt +@@ -419,7 +419,8 @@ else() set(LIBOMP_INSTALL_KIND ARCHIVE) endif() diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 1c878a50..f4d4de6d 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -2,11 +2,11 @@ clang/bindings/python/clang/cindex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/bindings/python/clang/cindex.py +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/bindings/python/clang/cindex.py =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/bindings/python/clang/cindex.py -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/bindings/python/clang/cindex.py -@@ -3980,7 +3980,7 @@ class Config: +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/bindings/python/clang/cindex.py ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/bindings/python/clang/cindex.py +@@ -4045,7 +4045,7 @@ class Config: elif name == "Windows": file = "libclang.dll" else: diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff index bddc1987..677ad487 100644 --- a/debian/patches/remove-apple-clang-manpage.diff +++ b/debian/patches/remove-apple-clang-manpage.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9/clang/docs/CommandGuide/clang.rst +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/CommandGuide/clang.rst =================================================================== ---- llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9.orig/clang/docs/CommandGuide/clang.rst -+++ llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9/clang/docs/CommandGuide/clang.rst +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/docs/CommandGuide/clang.rst ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/docs/CommandGuide/clang.rst @@ -354,24 +354,10 @@ Clang fully supports cross compilation a Depending on how your version of Clang is configured, it may have support for a number of cross compilers, or may only support a native target. @@ -27,7 +27,7 @@ Index: llvm-toolchain-snapshot_19~++20240616011956+edabb5c12ed9/clang/docs/Comma .. option:: --print-supported-cpus Print out a list of supported processors for the given target (specified -@@ -721,11 +707,6 @@ ENVIRONMENT +@@ -740,11 +726,6 @@ ENVIRONMENT These environment variables specify additional paths, as for :envvar:`CPATH`, which are only used when processing the appropriate language. diff --git a/debian/patches/symbolizer-path.diff b/debian/patches/symbolizer-path.diff index 4ed4338b..a3fa2b29 100644 --- a/debian/patches/symbolizer-path.diff +++ b/debian/patches/symbolizer-path.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp @@ -34,6 +34,11 @@ # include "sanitizer_symbolizer_libbacktrace.h" # include "sanitizer_symbolizer_mac.h" @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/ VReport(2, "Using llvm-symbolizer found at: %s\n", found_path); return new(*allocator) LLVMSymbolizer(found_path, allocator); } -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/CMakeLists.txt +Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/compiler-rt/lib/sanitizer_common/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/compiler-rt/lib/sanitizer_common/CMakeLists.txt -@@ -214,6 +214,7 @@ set(SANITIZER_IMPL_HEADERS +--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt ++++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/compiler-rt/lib/sanitizer_common/CMakeLists.txt +@@ -211,6 +211,7 @@ set(SANITIZER_IMPL_HEADERS ) include_directories(..) From 320f4d9769b2bda496726a5eded5fa264bf682d7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 15 Oct 2024 15:12:41 +0200 Subject: [PATCH 234/241] * New release * Update Standards version to 4.7.0 --- debian/changelog | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07cb669f..c7826484 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,4 @@ -llvm-toolchain-19 (1:19.1.1-2) UNRELEASED; urgency=medium - - * Update Standards version to 4.7.0 +llvm-toolchain-19 (1:19.1.2-1) unstable; urgency=medium [ Samuel Thibault ] * patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39. @@ -13,7 +11,11 @@ llvm-toolchain-19 (1:19.1.1-2) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Don't try to install xray and profile headers on powerpc - -- Sylvestre Ledru Wed, 02 Oct 2024 10:29:32 +0200 + [ Sylvestre Ledru ] + * New release + * Update Standards version to 4.7.0 + + -- Sylvestre Ledru Tue, 15 Oct 2024 15:11:47 +0200 llvm-toolchain-19 (1:19.1.1-1) unstable; urgency=medium From b31ea97a0089d8e6451266f051f196bb92622e5e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 16 Oct 2024 08:46:13 +0200 Subject: [PATCH 235/241] try to remove g++-multilib on s390x --- debian/control | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index bee671a3..72a44e18 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libipt-dev [amd64 i386], lcov, procps, help2man, zlib1g-dev, libzstd-dev, - g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32], + g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen, time, ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], diff --git a/debian/rules b/debian/rules index 5e4aba68..d2dd2886 100755 --- a/debian/rules +++ b/debian/rules @@ -111,7 +111,7 @@ DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') include /usr/share/dpkg/architecture.mk -MULTILIB_ARCHS := amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32 +MULTILIB_ARCHS := amd64 i386 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32 ifeq ($(DERIVATIVE),Ubuntu) ifeq (,$(filter $(DISTRO), bionic focal jammy noble)) MULTILIB_ARCHS := $(filter-out s390x, $(MULTILIB_ARCHS)) From c3b2462be1f2050e9910fbb248689719255b98eb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 21 Oct 2024 10:17:35 +0200 Subject: [PATCH 236/241] Revert "try to remove g++-multilib on s390x" This reverts commit b31ea97a0089d8e6451266f051f196bb92622e5e. --- debian/control | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 72a44e18..bee671a3 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libipt-dev [amd64 i386], lcov, procps, help2man, zlib1g-dev, libzstd-dev, - g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32], + g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen, time, ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], diff --git a/debian/rules b/debian/rules index d2dd2886..5e4aba68 100755 --- a/debian/rules +++ b/debian/rules @@ -111,7 +111,7 @@ DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') include /usr/share/dpkg/architecture.mk -MULTILIB_ARCHS := amd64 i386 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32 +MULTILIB_ARCHS := amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32 ifeq ($(DERIVATIVE),Ubuntu) ifeq (,$(filter $(DISTRO), bionic focal jammy noble)) MULTILIB_ARCHS := $(filter-out s390x, $(MULTILIB_ARCHS)) From b13a5e5005bcc0da6bde1a2331d82c14e79fd9d1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 21 Oct 2024 10:20:21 +0200 Subject: [PATCH 237/241] Use the | hello trick for g++-multilib for s390x / Ubuntu Oracular --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c7826484..80f3108d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.2-2) unstable; urgency=medium + + * Use the | hello trick for g++-multilib for s390x / Ubuntu Oracular + + -- Sylvestre Ledru Mon, 21 Oct 2024 10:20:12 +0200 + llvm-toolchain-19 (1:19.1.2-1) unstable; urgency=medium [ Samuel Thibault ] diff --git a/debian/control b/debian/control index bee671a3..3df5c492 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libipt-dev [amd64 i386], lcov, procps, help2man, zlib1g-dev, libzstd-dev, - g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32], + g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32] | hello, libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen, time, ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], diff --git a/debian/control.in b/debian/control.in index f6ca0b64..dad542de 100644 --- a/debian/control.in +++ b/debian/control.in @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libipt-dev [amd64 i386], lcov, procps, help2man, zlib1g-dev, libzstd-dev, - g++-multilib [@MULTILIB_ARCHS@], + g++-multilib [@MULTILIB_ARCHS@] | hello, libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen,@USAGE_BUILD_DEP@ ocaml-base [@OCAML_ARCHS@] | ocaml-nox [@OCAML_ARCHS@], From a18686e1ae3e5f628e199f790f894243e6b753bc Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 21 Oct 2024 13:47:16 +0200 Subject: [PATCH 238/241] Don't try to install xray and profile headers on hurd-any * libclang-common-X.Y-dev.install.in --- debian/changelog | 7 +++++++ debian/libclang-common-X.Y-dev.install.in | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80f3108d..52d31ea6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-19 (1:19.1.2-3) UNRELEASED; urgency=medium + + * libclang-common-X.Y-dev.install.in: Don't try to install xray and profile + headers on hurd-any. + + -- Samuel Thibault Mon, 21 Oct 2024 13:46:49 +0200 + llvm-toolchain-19 (1:19.1.2-2) unstable; urgency=medium * Use the | hello trick for g++-multilib for s390x / Ubuntu Oracular diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index f3cbb39e..7b9dc172 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -2,8 +2,8 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap -[!armel !armhf !powerpc !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ -[!armel !armhf !powerpc !x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/ +[!armel !armhf !powerpc !x32 !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ +[!armel !armhf !powerpc !x32 !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/ From d0b58c8b0379503f2b63a41ab15e2e1292b17bdb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 21 Oct 2024 14:36:31 +0200 Subject: [PATCH 239/241] fix changelog --- debian/changelog | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52d31ea6..e39fbda2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,10 @@ -llvm-toolchain-19 (1:19.1.2-3) UNRELEASED; urgency=medium +llvm-toolchain-19 (1:19.1.2-2) UNRELEASED; urgency=medium + [ Samuel Thibault ] * libclang-common-X.Y-dev.install.in: Don't try to install xray and profile headers on hurd-any. - -- Samuel Thibault Mon, 21 Oct 2024 13:46:49 +0200 - -llvm-toolchain-19 (1:19.1.2-2) unstable; urgency=medium - + [ Sylvestre Ledru ] * Use the | hello trick for g++-multilib for s390x / Ubuntu Oracular -- Sylvestre Ledru Mon, 21 Oct 2024 10:20:12 +0200 From 19672095b1ff51631de37313c5683e54025bb44c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 22 Oct 2024 11:50:31 +0200 Subject: [PATCH 240/241] remove old patch --- debian/patches/fix-typo.diff | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 debian/patches/fix-typo.diff diff --git a/debian/patches/fix-typo.diff b/debian/patches/fix-typo.diff deleted file mode 100644 index 4692f8b3..00000000 --- a/debian/patches/fix-typo.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: llvm-toolchain-14-14.0.6/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h -=================================================================== ---- llvm-toolchain-14-14.0.6.orig/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h -+++ llvm-toolchain-14-14.0.6/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h -@@ -84,7 +84,7 @@ protected: - #ifndef NDEBUG - ~RefCountedBase() { - assert(RefCount == 0 && -- "Destruction occured when there are still references to this."); -+ "Destruction occurred when there are still references to this."); - } - #else - // Default the destructor in release builds, A trivial destructor may enable -@@ -115,7 +115,7 @@ protected: - #ifndef NDEBUG - ~ThreadSafeRefCountedBase() { - assert(RefCount == 0 && -- "Destruction occured when there are still references to this."); -+ "Destruction occurred when there are still references to this."); - } - #else - // Default the destructor in release builds, A trivial destructor may enable -Index: llvm-toolchain-14-14.0.6/llvm/include/llvm/Support/CommandLine.h -=================================================================== ---- llvm-toolchain-14-14.0.6.orig/llvm/include/llvm/Support/CommandLine.h -+++ llvm-toolchain-14-14.0.6/llvm/include/llvm/Support/CommandLine.h -@@ -1308,7 +1308,7 @@ template <> struct applicator struct applicator { - static void opt(MiscFlags MF, Option &O) { - assert((MF != Grouping || O.ArgStr.size() == 1) && -- "cl::Grouping can only apply to single charater Options."); -+ "cl::Grouping can only apply to single character Options."); - O.setMiscFlag(MF); - } - }; From 29f1dabde51b25755e4aaf7c8d3159ebd99c24c5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 22 Oct 2024 11:54:38 +0200 Subject: [PATCH 241/241] remove old patches --- .../0001-tsan-doesn-t-work-on-arm.patch | 24 -- ...-Disable-test_asan_heap.c-for-arm-30.patch | 26 -- .../patches/0003-leaksan-add-a-test-31.patch | 35 --- debian/patches/D92052.patch | 77 ------ debian/patches/bring-reporter-back.patch | 223 ------------------ debian/patches/clang_vendor_pass_stage2.diff | 20 -- debian/patches/disable-lit-cpuid-install.diff | 10 - debian/patches/libcxx-D124227-wasm.patch | 35 --- .../libcxx/libcxx-riscv64-cycletimer.diff | 81 ------- debian/patches/lldb/lldb-libname.diff | 17 -- debian/patches/mips/mips-assert-size.diff | 19 -- .../on-the-fly/use-scan-build-runtimes.diff | 17 -- .../silent-integration-test-suite-i386.diff | 49 ---- debian/patches/workaround-bug-48259.diff | 15 -- 14 files changed, 648 deletions(-) delete mode 100644 debian/patches/0001-tsan-doesn-t-work-on-arm.patch delete mode 100644 debian/patches/0002-Disable-test_asan_heap.c-for-arm-30.patch delete mode 100644 debian/patches/0003-leaksan-add-a-test-31.patch delete mode 100644 debian/patches/D92052.patch delete mode 100644 debian/patches/bring-reporter-back.patch delete mode 100644 debian/patches/clang_vendor_pass_stage2.diff delete mode 100644 debian/patches/disable-lit-cpuid-install.diff delete mode 100644 debian/patches/libcxx-D124227-wasm.patch delete mode 100644 debian/patches/libcxx/libcxx-riscv64-cycletimer.diff delete mode 100644 debian/patches/lldb/lldb-libname.diff delete mode 100644 debian/patches/mips/mips-assert-size.diff delete mode 100644 debian/patches/on-the-fly/use-scan-build-runtimes.diff delete mode 100644 debian/patches/silent-integration-test-suite-i386.diff delete mode 100644 debian/patches/workaround-bug-48259.diff diff --git a/debian/patches/0001-tsan-doesn-t-work-on-arm.patch b/debian/patches/0001-tsan-doesn-t-work-on-arm.patch deleted file mode 100644 index c63e9b24..00000000 --- a/debian/patches/0001-tsan-doesn-t-work-on-arm.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8984b5d9a9bb143844e716db79388808f6944270 Mon Sep 17 00:00:00 2001 -From: Sylvestre Ledru -Date: Sun, 18 Oct 2020 18:56:17 +0200 -Subject: [PATCH 1/3] tsan doesn't work on arm - ---- - tests/test_tsan.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/integration-test-suite/tests/test_tsan.c b/tests/test_tsan.c -index ed9aaec..197d3a4 100644 ---- a/integration-test-suite/tests/test_tsan.c -+++ b/integration-test-suite/tests/test_tsan.c -@@ -5,6 +5,7 @@ - // RUN: %llvm-nm %t | grep __tsan - // RUN: env TSAN_OPTIONS="log_path=stdout:exitcode=0" %t 2>&1 > %t.out - // RUN: grep -q "data race" %t.out -+// XFAIL: arm - - #include - #include --- -2.28.0 - diff --git a/debian/patches/0002-Disable-test_asan_heap.c-for-arm-30.patch b/debian/patches/0002-Disable-test_asan_heap.c-for-arm-30.patch deleted file mode 100644 index 9382034e..00000000 --- a/debian/patches/0002-Disable-test_asan_heap.c-for-arm-30.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 77f09cd056d5183fa048d2b8fdc29302dca25ed7 Mon Sep 17 00:00:00 2001 -From: Sylvestre Ledru -Date: Mon, 19 Oct 2020 14:43:32 +0200 -Subject: [PATCH 2/3] Disable test_asan_heap.c for arm (#30) - -Unsupported on this arch: -clang: error: unsupported option '-fsanitize=thread' for target 'armv7l-unknown-linux-gnueabihf' ---- - tests/test_asan_heap.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/integration-test-suite/tests/test_asan_heap.c b/tests/test_asan_heap.c -index 828ac4f..f021703 100644 ---- a/integration-test-suite/tests/test_asan_heap.c -+++ b/integration-test-suite/tests/test_asan_heap.c -@@ -4,6 +4,7 @@ - // RUN: %clang -o %t -fsanitize=address -O1 -fno-omit-frame-pointer -g %s - // RUN: env ASAN_OPTIONS="log_path=stdout:exitcode=0" %t 2>&1 > %t.out - // RUN: grep -q "heap-use-after-free" %t.out -+// XFAIL: arm - - #include - int main() { --- -2.28.0 - diff --git a/debian/patches/0003-leaksan-add-a-test-31.patch b/debian/patches/0003-leaksan-add-a-test-31.patch deleted file mode 100644 index 66918206..00000000 --- a/debian/patches/0003-leaksan-add-a-test-31.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5fd1282d17fb5db341239af2853ab12f4ff141c8 Mon Sep 17 00:00:00 2001 -From: Sylvestre Ledru -Date: Mon, 19 Oct 2020 14:55:20 +0200 -Subject: [PATCH 3/3] leaksan: add a test (#31) - ---- - tests/test_leaksan.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - create mode 100644 tests/test_leaksan.c - -diff --git a/integration-test-suite/tests/test_leaksan.c b/tests/test_leaksan.c -new file mode 100644 -index 0000000..db425a1 ---- /dev/null -+++ b/integration-test-suite/tests/test_leaksan.c -@@ -0,0 +1,16 @@ -+// Test asan use after free -+// -+// REQUIRES: clang -+// RUN: %clang -o %t -fsanitize=address -g %s -+// RUN: env ASAN_OPTIONS="log_path=stdout:exitcode=0" %t 2>&1 > %t.out -+// RUN: grep -q "detected memory leaks" %t.out -+ -+#include -+ -+void *p; -+ -+int main() { -+ p = malloc(7); -+ p = 0; // The memory is leaked here. -+ return 0; -+} --- -2.28.0 - diff --git a/debian/patches/D92052.patch b/debian/patches/D92052.patch deleted file mode 100644 index 4c198788..00000000 --- a/debian/patches/D92052.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: llvm/lib/MC/MCParser/ELFAsmParser.cpp -=================================================================== ---- a/llvm/lib/MC/MCParser/ELFAsmParser.cpp -+++ b/llvm/lib/MC/MCParser/ELFAsmParser.cpp -@@ -652,10 +652,13 @@ - !(SectionName == ".eh_frame" && Type == ELF::SHT_PROGBITS)) - Error(loc, "changed section type for " + SectionName + ", expected: 0x" + - utohexstr(Section->getType())); -- if (Section->getFlags() != Flags) -+ // Check that flags are used consistently. However, the GNU assembler permits -+ // to leave out in subsequent uses of the same sections; for compatibility, -+ // do likewise. -+ if ((Flags || Size || !TypeName.empty()) && Section->getFlags() != Flags) - Error(loc, "changed section flags for " + SectionName + ", expected: 0x" + - utohexstr(Section->getFlags())); -- if (Section->getEntrySize() != Size) -+ if ((Flags || Size || !TypeName.empty()) && Section->getEntrySize() != Size) - Error(loc, "changed section entsize for " + SectionName + - ", expected: " + Twine(Section->getEntrySize())); - -Index: llvm/test/MC/ELF/section-entsize-changed.s -=================================================================== ---- a/llvm/test/MC/ELF/section-entsize-changed.s -+++ b/llvm/test/MC/ELF/section-entsize-changed.s -@@ -10,3 +10,26 @@ - .pushsection .foo,"aM",@progbits,4 - - .pushsection .foo,"aM",@progbits,1 -+ -+ -+bar: -+.section .bar,"ax",@progbits -+ -+.section .bar -+ -+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .bar, expected: 0x6 -+.section .bar,"awx",@progbits -+ -+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .bar, expected: 0x6 -+.pushsection .bar,"a",@progbits -+ -+.pushsection .bar -+ -+foobar: -+.section .foobar,"ax",@progbits; .byte 1 -+ -+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .foobar, expected: 0x6 -+.section .foobar,"",@progbits; .byte 2 -+ -+# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .foobar, expected: 0x6 -+.section .foobar,"a",@progbits; .byte 3 -Index: llvm/test/MC/ELF/section-omitted-attributes.s -=================================================================== ---- /dev/null -+++ llvm/test/MC/ELF/section-omitted-attributes.s -@@ -0,0 +1,21 @@ -+# RUN: llvm-mc -triple=x86_64 %s -o - | FileCheck %s -+ -+// CHECK: .section .foo,"aM",@progbits,1 -+// CHECK: .section .bar,"aM",@progbits,4 -+ -+foo: -+.section .foo,"aM",@progbits,1 -+ -+.section .foo -+ -+.pushsection .foo -+ -+.pushsection .foo -+ -+.section .bar,"aM",@progbits,4 -+ -+.section .bar -+ -+.pushsection .bar,"aM",@progbits,4 -+ -+.pushsection .bar diff --git a/debian/patches/bring-reporter-back.patch b/debian/patches/bring-reporter-back.patch deleted file mode 100644 index 4baff59a..00000000 --- a/debian/patches/bring-reporter-back.patch +++ /dev/null @@ -1,223 +0,0 @@ -From e3cd3a3c91524c957e06bb0170343548f02b6842 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Thu, 11 Feb 2021 22:28:19 +0000 -Subject: [PATCH] Partially Revert "scan-view: Remove Reporter.py and - associated AppleScript files" - -This reverts some of commit dbb01536f6f49fa428f170e34466072ef439b3e9. - -The Reporter module was still being used by the ScanView.py module and deleting -it caused scan-view to fail. This commit adds back Reporter.py but removes the -code the references the AppleScript files which were removed in -dbb01536f6f49fa428f170e34466072ef439b3e9. - -Reviewed By: NoQ - -Differential Revision: https://reviews.llvm.org/D96367 ---- - clang/tools/scan-view/CMakeLists.txt | 1 + - clang/tools/scan-view/share/Reporter.py | 183 ++++++++++++++++++++++++ - 2 files changed, 184 insertions(+) - create mode 100644 clang/tools/scan-view/share/Reporter.py - -diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt -index dd3d33439299..eccc6b83195b 100644 ---- a/clang/tools/scan-view/CMakeLists.txt -+++ b/clang/tools/scan-view/CMakeLists.txt -@@ -5,6 +5,7 @@ set(BinFiles - - set(ShareFiles - ScanView.py -+ Reporter.py - startfile.py - bugcatcher.ico) - -diff --git a/clang/tools/scan-view/share/Reporter.py b/clang/tools/scan-view/share/Reporter.py -new file mode 100644 -index 000000000000..31a14fb0cf74 ---- /dev/null -+++ b/clang/tools/scan-view/share/Reporter.py -@@ -0,0 +1,183 @@ -+#!/usr/bin/env python -+# -*- coding: utf-8 -*- -+ -+"""Methods for reporting bugs.""" -+ -+import subprocess, sys, os -+ -+__all__ = ['ReportFailure', 'BugReport', 'getReporters'] -+ -+# -+ -+class ReportFailure(Exception): -+ """Generic exception for failures in bug reporting.""" -+ def __init__(self, value): -+ self.value = value -+ -+# Collect information about a bug. -+ -+class BugReport(object): -+ def __init__(self, title, description, files): -+ self.title = title -+ self.description = description -+ self.files = files -+ -+# Reporter interfaces. -+ -+import os -+ -+import email, mimetypes, smtplib -+from email import encoders -+from email.message import Message -+from email.mime.base import MIMEBase -+from email.mime.multipart import MIMEMultipart -+from email.mime.text import MIMEText -+ -+#===------------------------------------------------------------------------===# -+# ReporterParameter -+#===------------------------------------------------------------------------===# -+ -+class ReporterParameter(object): -+ def __init__(self, n): -+ self.name = n -+ def getName(self): -+ return self.name -+ def getValue(self,r,bugtype,getConfigOption): -+ return getConfigOption(r.getName(),self.getName()) -+ def saveConfigValue(self): -+ return True -+ -+class TextParameter (ReporterParameter): -+ def getHTML(self,r,bugtype,getConfigOption): -+ return """\ -+ -+%s: -+ -+"""%(self.getName(),r.getName(),self.getName(),self.getValue(r,bugtype,getConfigOption)) -+ -+class SelectionParameter (ReporterParameter): -+ def __init__(self, n, values): -+ ReporterParameter.__init__(self,n) -+ self.values = values -+ -+ def getHTML(self,r,bugtype,getConfigOption): -+ default = self.getValue(r,bugtype,getConfigOption) -+ return """\ -+ -+%s:"""%(self.getName(),r.getName(),self.getName(),'\n'.join(["""\ -+"""%(o[0], -+ o[0] == default and ' selected="selected"' or '', -+ o[1]) for o in self.values])) -+ -+#===------------------------------------------------------------------------===# -+# Reporters -+#===------------------------------------------------------------------------===# -+ -+class EmailReporter(object): -+ def getName(self): -+ return 'Email' -+ -+ def getParameters(self): -+ return [TextParameter(x) for x in ['To', 'From', 'SMTP Server', 'SMTP Port']] -+ -+ # Lifted from python email module examples. -+ def attachFile(self, outer, path): -+ # Guess the content type based on the file's extension. Encoding -+ # will be ignored, although we should check for simple things like -+ # gzip'd or compressed files. -+ ctype, encoding = mimetypes.guess_type(path) -+ if ctype is None or encoding is not None: -+ # No guess could be made, or the file is encoded (compressed), so -+ # use a generic bag-of-bits type. -+ ctype = 'application/octet-stream' -+ maintype, subtype = ctype.split('/', 1) -+ if maintype == 'text': -+ fp = open(path) -+ # Note: we should handle calculating the charset -+ msg = MIMEText(fp.read(), _subtype=subtype) -+ fp.close() -+ else: -+ fp = open(path, 'rb') -+ msg = MIMEBase(maintype, subtype) -+ msg.set_payload(fp.read()) -+ fp.close() -+ # Encode the payload using Base64 -+ encoders.encode_base64(msg) -+ # Set the filename parameter -+ msg.add_header('Content-Disposition', 'attachment', filename=os.path.basename(path)) -+ outer.attach(msg) -+ -+ def fileReport(self, report, parameters): -+ mainMsg = """\ -+BUG REPORT -+--- -+Title: %s -+Description: %s -+"""%(report.title, report.description) -+ -+ if not parameters.get('To'): -+ raise ReportFailure('No "To" address specified.') -+ if not parameters.get('From'): -+ raise ReportFailure('No "From" address specified.') -+ -+ msg = MIMEMultipart() -+ msg['Subject'] = 'BUG REPORT: %s'%(report.title) -+ # FIXME: Get config parameters -+ msg['To'] = parameters.get('To') -+ msg['From'] = parameters.get('From') -+ msg.preamble = mainMsg -+ -+ msg.attach(MIMEText(mainMsg, _subtype='text/plain')) -+ for file in report.files: -+ self.attachFile(msg, file) -+ -+ try: -+ s = smtplib.SMTP(host=parameters.get('SMTP Server'), -+ port=parameters.get('SMTP Port')) -+ s.sendmail(msg['From'], msg['To'], msg.as_string()) -+ s.close() -+ except: -+ raise ReportFailure('Unable to send message via SMTP.') -+ -+ return "Message sent!" -+ -+class BugzillaReporter(object): -+ def getName(self): -+ return 'Bugzilla' -+ -+ def getParameters(self): -+ return [TextParameter(x) for x in ['URL','Product']] -+ -+ def fileReport(self, report, parameters): -+ raise NotImplementedError -+ -+ -+class RadarClassificationParameter(SelectionParameter): -+ def __init__(self): -+ SelectionParameter.__init__(self,"Classification", -+ [['1', 'Security'], ['2', 'Crash/Hang/Data Loss'], -+ ['3', 'Performance'], ['4', 'UI/Usability'], -+ ['6', 'Serious Bug'], ['7', 'Other']]) -+ -+ def saveConfigValue(self): -+ return False -+ -+ def getValue(self,r,bugtype,getConfigOption): -+ if bugtype.find("leak") != -1: -+ return '3' -+ elif bugtype.find("dereference") != -1: -+ return '2' -+ elif bugtype.find("missing ivar release") != -1: -+ return '3' -+ else: -+ return '7' -+ -+### -+ -+def getReporters(): -+ reporters = [] -+ reporters.append(EmailReporter()) -+ return reporters -+ diff --git a/debian/patches/clang_vendor_pass_stage2.diff b/debian/patches/clang_vendor_pass_stage2.diff deleted file mode 100644 index 80b8cb0b..00000000 --- a/debian/patches/clang_vendor_pass_stage2.diff +++ /dev/null @@ -1,20 +0,0 @@ -commit ca467542eecfc621eea7fefb3c7e3849c6b43ac7 -Author: Sylvestre Ledru -Date: Fri May 29 09:13:08 2020 +0200 - - [CMake] Pass CLANG_VENDOR variables into later stages - - We are already passing CLANG_VERSION_* & PACKAGE_VENDOR - -diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt -index 7dadc5f6e91..5a5e34aacbe 100644 ---- a/clang/CMakeLists.txt -+++ b/clang/CMakeLists.txt -@@ -711,6 +711,7 @@ if (CLANG_ENABLE_BOOTSTRAP) - CLANG_VERSION_MAJOR - CLANG_VERSION_MINOR - CLANG_VERSION_PATCHLEVEL -+ CLANG_VENDOR - LLVM_VERSION_SUFFIX - LLVM_BINUTILS_INCDIR - CLANG_REPOSITORY_STRING diff --git a/debian/patches/disable-lit-cpuid-install.diff b/debian/patches/disable-lit-cpuid-install.diff deleted file mode 100644 index 9a4f7312..00000000 --- a/debian/patches/disable-lit-cpuid-install.diff +++ /dev/null @@ -1,10 +0,0 @@ -Index: llvm-toolchain-9-9/lldb/utils/lit-cpuid/CMakeLists.txt -=================================================================== ---- llvm-toolchain-9-9.orig/lldb/utils/lit-cpuid/CMakeLists.txt -+++ llvm-toolchain-9-9/lldb/utils/lit-cpuid/CMakeLists.txt -@@ -1,4 +1,4 @@ --add_llvm_utility(lit-cpuid -+add_lldb_executable(lit-cpuid - lit-cpuid.cpp - ) - diff --git a/debian/patches/libcxx-D124227-wasm.patch b/debian/patches/libcxx-D124227-wasm.patch deleted file mode 100644 index 9b1b59e2..00000000 --- a/debian/patches/libcxx-D124227-wasm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 67b0b02ec9f2bbc57bf8f0550828d97f460ac11f Mon Sep 17 00:00:00 2001 -From: Brad Smith -Date: Sat, 7 May 2022 01:06:32 -0400 -Subject: [PATCH] [libcxx] Remove static inline and make use of - _LIBCPP_HIDE_FROM_ABI in __support headers - -After feedback from D122861, do the same thing with some of the other headers. Try to move the -headers so they have a similar style and way of doing things. - -+ also applies: -https://reviews.llvm.org/D141208 - -Reviewed By: ldionne, daltenty - -Differential Revision: https://reviews.llvm.org/D124227 ---- - libcxx/include/__support/ibm/gettod_zos.h | 3 +- - libcxx/include/__support/ibm/xlocale.h | 53 +++++++++------------ - libcxx/include/__support/musl/xlocale.h | 31 ++++++------ - libcxx/include/__support/solaris/xlocale.h | 55 +++++++++++----------- - 4 files changed, 67 insertions(+), 75 deletions(-) - -Index: llvm-toolchain-15_15.0.6~++20230102020141+088f33605d8a/libcxx/include/__support/musl/xlocale.h -=================================================================== ---- llvm-toolchain-15_15.0.6~++20230102020141+088f33605d8a.orig/libcxx/include/__support/musl/xlocale.h -+++ llvm-toolchain-15_15.0.6~++20230102020141+088f33605d8a/libcxx/include/__support/musl/xlocale.h -@@ -39,7 +39,7 @@ wcstoll_l(const wchar_t *__nptr, wchar_t - return ::wcstoll(__nptr, __endptr, __base); - } - --inline _LIBCPP_HIDE_FROM_ABI long long -+inline _LIBCPP_HIDE_FROM_ABI unsigned long long - wcstoull_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) { - return ::wcstoull(__nptr, __endptr, __base); - } diff --git a/debian/patches/libcxx/libcxx-riscv64-cycletimer.diff b/debian/patches/libcxx/libcxx-riscv64-cycletimer.diff deleted file mode 100644 index 18223264..00000000 --- a/debian/patches/libcxx/libcxx-riscv64-cycletimer.diff +++ /dev/null @@ -1,81 +0,0 @@ -commit 09e6304440c08fe72b6ac05f922ab9d8b7f1e387 -Author: Roger Ferrer Ibanez -Date: Wed Jul 24 05:33:46 2019 +0000 - - [RISCV] Implement benchmark::cycleclock::Now - - This is a cherrypick of D64237 onto llvm/utils/benchmark and - libcxx/utils/google-benchmark. - - Differential Revision: https://reviews.llvm.org/D65142 - - llvm-svn: 366868 - ---- a/libcxx/utils/google-benchmark/README.LLVM -+++ b/libcxx/utils/google-benchmark/README.LLVM -@@ -4,3 +4,9 @@ LLVM notes - This directory contains the Google Benchmark source code with some unnecessary - files removed. Note that this directory is under a different license than - libc++. -+ -+Changes: -+* https://github.com/google/benchmark/commit/4abdfbb802d1b514703223f5f852ce4a507d32d2 -+ is applied on top of -+ https://github.com/google/benchmark/commit/4528c76b718acc9b57956f63069c699ae21edcab -+ to add RISC-V timer support. ---- a/libcxx/utils/google-benchmark/src/cycleclock.h -+++ b/libcxx/utils/google-benchmark/src/cycleclock.h -@@ -164,6 +164,21 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { - uint64_t tsc; - asm("stck %0" : "=Q"(tsc) : : "cc"); - return tsc; -+#elif defined(__riscv) // RISC-V -+ // Use RDCYCLE (and RDCYCLEH on riscv32) -+#if __riscv_xlen == 32 -+ uint64_t cycles_low, cycles_hi0, cycles_hi1; -+ asm("rdcycleh %0" : "=r"(cycles_hi0)); -+ asm("rdcycle %0" : "=r"(cycles_lo)); -+ asm("rdcycleh %0" : "=r"(cycles_hi1)); -+ // This matches the PowerPC overflow detection, above -+ cycles_lo &= -static_cast(cycles_hi0 == cycles_hi1); -+ return (cycles_hi1 << 32) | cycles_lo; -+#else -+ uint64_t cycles; -+ asm("rdcycle %0" : "=r"(cycles)); -+ return cycles; -+#endif - #else - // The soft failover to a generic implementation is automatic only for ARM. - // For other platforms the developer is expected to make an attempt to create ---- a/utils/benchmark/README.LLVM -+++ b/utils/benchmark/README.LLVM -@@ -23,3 +23,5 @@ Changes: - is applied to disable exceptions in Microsoft STL when exceptions are disabled - * Disabled CMake get_git_version as it is meaningless for this in-tree build, - and hardcoded a null version -+* https://github.com/google/benchmark/commit/4abdfbb802d1b514703223f5f852ce4a507d32d2 -+ is applied on top of v1.4.1 to add RISC-V timer support. ---- a/utils/benchmark/src/cycleclock.h -+++ b/utils/benchmark/src/cycleclock.h -@@ -164,6 +164,21 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { - uint64_t tsc; - asm("stck %0" : "=Q" (tsc) : : "cc"); - return tsc; -+#elif defined(__riscv) // RISC-V -+ // Use RDCYCLE (and RDCYCLEH on riscv32) -+#if __riscv_xlen == 32 -+ uint64_t cycles_low, cycles_hi0, cycles_hi1; -+ asm("rdcycleh %0" : "=r"(cycles_hi0)); -+ asm("rdcycle %0" : "=r"(cycles_lo)); -+ asm("rdcycleh %0" : "=r"(cycles_hi1)); -+ // This matches the PowerPC overflow detection, above -+ cycles_lo &= -static_cast(cycles_hi0 == cycles_hi1); -+ return (cycles_hi1 << 32) | cycles_lo; -+#else -+ uint64_t cycles; -+ asm("rdcycle %0" : "=r"(cycles)); -+ return cycles; -+#endif - #else - // The soft failover to a generic implementation is automatic only for ARM. - // For other platforms the developer is expected to make an attempt to create diff --git a/debian/patches/lldb/lldb-libname.diff b/debian/patches/lldb/lldb-libname.diff deleted file mode 100644 index e022bed3..00000000 --- a/debian/patches/lldb/lldb-libname.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- - lldb/scripts/Python/finishSwigPythonLLDB.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: llvm-toolchain-snapshot_16~svn3316516/lldb/scripts/Python/finishSwigPythonLLDB.py -=================================================================== ---- llvm-toolchain-snapshot_16~svn3316516.orig/lldb/scripts/Python/finishSwigPythonLLDB.py -+++ llvm-toolchain-snapshot_16~svn3316516/lldb/scripts/Python/finishSwigPythonLLDB.py -@@ -443,7 +443,7 @@ def make_symlink_liblldb( - if eOSType == utilsOsType.EnumOsType.Darwin: - strLibFileExtn = ".dylib" - else: -- strLibFileExtn = ".so" -+ strLibFileExtn = "-16.so" - strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn) - - bOk, strErrMsg = make_symlink( diff --git a/debian/patches/mips/mips-assert-size.diff b/debian/patches/mips/mips-assert-size.diff deleted file mode 100644 index 1d21e29b..00000000 --- a/debian/patches/mips/mips-assert-size.diff +++ /dev/null @@ -1,19 +0,0 @@ -Index: llvm-toolchain-15_15.0.3~++20221019061539+4a2c05b05ed0/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cpp -=================================================================== ---- llvm-toolchain-15_15.0.3~++20221019061539+4a2c05b05ed0.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cpp -+++ llvm-toolchain-15_15.0.3~++20221019061539+4a2c05b05ed0/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_linux.cpp -@@ -64,9 +64,12 @@ using namespace __sanitizer; - COMPILER_CHECK(struct___old_kernel_stat_sz == sizeof(struct __old_kernel_stat)); - #endif - --COMPILER_CHECK(struct_kernel_stat_sz == sizeof(struct stat)); -+# if defined(__LP64__) || \ -+ (!defined(_LARGEFILE_SOURCE) && _FILE_OFFSET_BITS != 64) -+ COMPILER_CHECK(struct_kernel_stat_sz == sizeof(struct stat)); -+# endif - --#if defined(__i386__) -+# if defined(__i386__) - COMPILER_CHECK(struct_kernel_stat64_sz == sizeof(struct stat64)); - #endif - diff --git a/debian/patches/on-the-fly/use-scan-build-runtimes.diff b/debian/patches/on-the-fly/use-scan-build-runtimes.diff deleted file mode 100644 index de54eab5..00000000 --- a/debian/patches/on-the-fly/use-scan-build-runtimes.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: llvm-toolchain-snapshot_14~++20220105111900+cdbad62c526c/clang/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_14~++20220105111900+cdbad62c526c.orig/clang/CMakeLists.txt -+++ llvm-toolchain-snapshot_14~++20220105111900+cdbad62c526c/clang/CMakeLists.txt -@@ -726,9 +726,9 @@ if (CLANG_ENABLE_BOOTSTRAP) - endif() - - set(COMPILER_OPTIONS -- -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${CXX_COMPILER} -- -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${C_COMPILER} -- -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${C_COMPILER} -+ -DCMAKE_CXX_COMPILER=/usr/share/clang/scan-build-${CLANG_VERSION_MAJOR}/libexec/c++-analyzer -+ -DCMAKE_C_COMPILER=/usr/share/clang/scan-build-${CLANG_VERSION_MAJOR}/libexec/ccc-analyzer -+ -DCMAKE_ASM_COMPILER=/usr/share/clang/scan-build-${CLANG_VERSION_MAJOR}/libexec/ccc-analyzer - -DCMAKE_ASM_COMPILER_ID=Clang) - - # cmake requires CMAKE_LINKER to be specified if the compiler is MSVC-like, diff --git a/debian/patches/silent-integration-test-suite-i386.diff b/debian/patches/silent-integration-test-suite-i386.diff deleted file mode 100644 index 79eee6d1..00000000 --- a/debian/patches/silent-integration-test-suite-i386.diff +++ /dev/null @@ -1,49 +0,0 @@ -Index: llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c/integration-test-suite/tests/basic_lldb.c -=================================================================== ---- llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c.orig/integration-test-suite/tests/basic_lldb.c -+++ llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c/integration-test-suite/tests/basic_lldb.c -@@ -1,6 +1,7 @@ - // RUN: %clang -g -o %t %s - // RUN: %lldb -s %S/basic_lldb.in %t | grep "main at basic_lldb.c:" - // REQUIRES: lldb, clang -+// XFAIL: i686, i386 - - int main() { - int a=0; -Index: llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c/integration-test-suite/tests/basic_lldb2.cpp -=================================================================== ---- llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c.orig/integration-test-suite/tests/basic_lldb2.cpp -+++ llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c/integration-test-suite/tests/basic_lldb2.cpp -@@ -1,6 +1,7 @@ - // RUN: %clangxx -g -o %t %s - // RUN: %lldb -s %S/basic_lldb2.in %t | grep "stop reason = step over" - // REQUIRES: lldb, clangxx -+// XFAIL: i686, i386 - - #include - int main (void) -Index: llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c/integration-test-suite/tests/test_asan_lc.c -=================================================================== ---- llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c.orig/integration-test-suite/tests/test_asan_lc.c -+++ llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c/integration-test-suite/tests/test_asan_lc.c -@@ -3,6 +3,7 @@ - // REQUIRES: clang - // RUN: %clang -fsanitize=address %s -o %t -lc - // RUN: %t -+// XFAIL: i686, i386 - - #include - int main(int argc, char **argv) -Index: llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c/integration-test-suite/tests/test_tsan.c -=================================================================== ---- llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c.orig/integration-test-suite/tests/test_tsan.c -+++ llvm-toolchain-11_11.0.1~++20201112101029+0874e7ef66c/integration-test-suite/tests/test_tsan.c -@@ -5,7 +5,7 @@ - // RUN: %llvm-nm %t | grep __tsan - // RUN: env TSAN_OPTIONS="log_path=stdout:exitcode=0" %t 2>&1 > %t.out - // RUN: grep -q "data race" %t.out --// XFAIL: arm -+// XFAIL: arm, i686, i386 - - #include - #include diff --git a/debian/patches/workaround-bug-48259.diff b/debian/patches/workaround-bug-48259.diff deleted file mode 100644 index 39d59c29..00000000 --- a/debian/patches/workaround-bug-48259.diff +++ /dev/null @@ -1,15 +0,0 @@ -Index: llvm-toolchain-snapshot_12~++20201124100523+245052ac3080/llvm/include/llvm/Support/Recycler.h -=================================================================== ---- llvm-toolchain-snapshot_12~++20201124100523+245052ac3080.orig/llvm/include/llvm/Support/Recycler.h -+++ llvm-toolchain-snapshot_12~++20201124100523+245052ac3080/llvm/include/llvm/Support/Recycler.h -@@ -83,8 +83,8 @@ public: - SubClass *Allocate(AllocatorType &Allocator) { - static_assert(alignof(SubClass) <= Align, - "Recycler allocation alignment is less than object align!"); -- static_assert(sizeof(SubClass) <= Size, -- "Recycler allocation size is less than object size!"); -+// static_assert(sizeof(SubClass) <= Size, -+// "Recycler allocation size is less than object size!"); - return FreeList ? reinterpret_cast(pop_val()) - : static_cast(Allocator.Allocate(Size, Align)); - }