From bf100602e2911e4a996220551c67c8d9616eb2e5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 25 Jul 2023 18:27:07 +0200 Subject: [PATCH 001/302] snapshot is now 18 --- debian/changelog | 6 ++ debian/control | 230 +++++++++++++++++++++++------------------------ 2 files changed, 121 insertions(+), 115 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae33213b..c8f402c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:18~++20230724083402+862b93a8095c-1~exp2) experimental; urgency=medium + + * snapshot is now 18 + + -- + llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium * Fix for real the libclang-rt-17-dev issue diff --git a/debian/control b/debian/control index 2e673c74..e556f5d7 100644 --- a/debian/control +++ b/debian/control @@ -40,16 +40,16 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot # ------------- clang ------------- -Package: clang-17 +Package: clang-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang-common-17-dev (= ${source:Version}), - llvm-17-linker-tools (= ${binary:Version}), - libclang1-17 (= ${binary:Version}), libc6-dev, binutils + ${dep:devlibs-objc}, libclang-common-18-dev (= ${source:Version}), + llvm-18-linker-tools (= ${binary:Version}), + libclang1-18 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-17-dev, python3 -# libomp-17-dev -Suggests: clang-17-doc, wasi-libc +Recommends: llvm-18-dev, python3 +# libomp-18-dev +Suggests: clang-18-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 @@ -58,9 +58,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-17 +Package: clang-tools-18 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-17 (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-18 (= ${binary:Version}), python3 Description: clang-based tools for C/C++ developments Clang project is a C, C++, Objective C and Objective C++ front-end @@ -72,10 +72,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-17 +Package: clang-format-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm17 (= ${binary:Version}) + libllvm18 (= ${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 @@ -88,21 +88,21 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: clang-tidy-17 +Package: clang-tidy-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm17 (= ${binary:Version}), libclang-common-17-dev, - clang-tools-17, python3-yaml + libllvm18 (= ${binary:Version}), libclang-common-18-dev, + clang-tools-18, 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-17 +Package: clangd-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libclang-common-17-dev (= ${source:Version}) + libclang-common-18-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 @@ -113,7 +113,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-17-doc +Package: clang-18-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax @@ -127,7 +127,7 @@ Description: C, C++ and Objective-C compiler - Documentation . This package contains the documentation. -Package: libclang1-17 +Package: libclang1-18 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -148,12 +148,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-17-dev +Package: libclang-18-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang1-17 (= ${binary:Version}), - libclang-common-17-dev (= ${source:Version}) + ${dep:devlibs-objc}, libclang1-18 (= ${binary:Version}), + libclang-common-18-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 @@ -163,14 +163,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-17. + libclang1-18. -Package: libclang-common-17-dev +Package: libclang-common-18-dev Architecture: all Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (>= ${source:Version}), - libllvm17 (<< ${source:Version}.1~) -Recommends: libclang-rt-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (>= ${source:Version}), + libllvm18 (<< ${source:Version}.1~) +Recommends: libclang-rt-18-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 @@ -183,12 +183,12 @@ Description: Clang library - Common development package # ------------- compiler-rt ------------- -Package: libclang-rt-17-dev +Package: libclang-rt-18-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) +Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) +Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Compiler-rt - development package This package provides various libraries: @@ -201,36 +201,36 @@ Description: Compiler-rt - development package DataFlowSanitizer, etc * profile - Library which is used to collect coverage information. -Package: libclang-rt-17-dev-wasm32 +Package: libclang-rt-18-dev-wasm32 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) +Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) +Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) +Recommends: libclang-common-18-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm32 builtins Provides the compiler-rt builtins for WebAssembly 32 bits -Package: libclang-rt-17-dev-wasm64 +Package: libclang-rt-18-dev-wasm64 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) +Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) +Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) +Recommends: libclang-common-18-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm64 builtins Provides the compiler-rt builtins for WebAssembly 64 bits # ------------- polly ------------- -Package: libpolly-17-dev +Package: libpolly-18-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-17-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) +Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) +Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: High-level loop and data-locality optimizer Uses an abstract mathematical representation based on integer polyhedra @@ -238,10 +238,10 @@ Description: High-level loop and data-locality optimizer # ------------- clang libraries ------------- -Package: libclang-cpp17 +Package: libclang-cpp18 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${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 @@ -259,12 +259,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-cpp17-dev +Package: libclang-cpp18-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-cpp17 (= ${binary:Version}) -# Move of libclang-cpp.so into libclang-cpp17.dev + libclang-cpp18 (= ${binary:Version}) +# Move of libclang-cpp.so into libclang-cpp18.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 @@ -285,10 +285,10 @@ Description: C++ interface to the Clang library linker at build time. -Package: libfuzzer-17-dev +Package: libfuzzer-18-dev Architecture: linux-any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-17 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-18 (= ${binary:Version}) Description: Library for coverage-guided fuzz testing LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing of other libraries. @@ -306,10 +306,10 @@ Description: Library for coverage-guided fuzz testing instrumentation. -Package: python3-clang-17 +Package: python3-clang-18 Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-17-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-18-dev Replaces: python-clang-x.y, Conflicts: python-clang-x.y Provides: python-clang-x.y @@ -323,7 +323,7 @@ Description: Clang Python Bindings . This binding package provides access to the Clang compiler and libraries. -Package: clang-17-examples +Package: clang-18-examples Architecture: any Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -339,7 +339,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm17 +Package: libllvm18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -352,7 +352,7 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: llvm-17-linker-tools +Package: llvm-18-linker-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Modular compiler and toolchain technologies - Plugins @@ -362,13 +362,13 @@ Description: Modular compiler and toolchain technologies - Plugins . This package contains the LLVMgold and LLVMPolly linker plugins. -Package: llvm-17 +Package: llvm-18 Architecture: any -Suggests: llvm-17-doc -Depends: llvm-17-runtime (= ${binary:Version}), - llvm-17-linker-tools (= ${binary:Version}), +Suggests: llvm-18-doc +Depends: llvm-18-runtime (= ${binary:Version}), + llvm-18-linker-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-17-dev +Recommends: llvm-18-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 @@ -392,7 +392,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-17-runtime +Package: llvm-18-runtime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: binfmt-support | systemd @@ -412,11 +412,11 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-17-dev +Package: llvm-18-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, - llvm-17 (= ${binary:Version}), libllvm17 (= ${binary:Version}), libncurses-dev, - llvm-17-tools (= ${binary:Version}), libclang-cpp17 (= ${binary:Version}), + llvm-18 (= ${binary:Version}), libllvm18 (= ${binary:Version}), libncurses-dev, + llvm-18-tools (= ${binary:Version}), libclang-cpp18 (= ${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 @@ -434,7 +434,7 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: llvm-17-tools +Package: llvm-18-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, python3-pygments, python3-yaml, @@ -454,11 +454,11 @@ Description: Modular compiler and toolchain technologies, tools . This package provides tools for testing. -Package: libllvm-17-ocaml-dev +Package: libllvm-18-ocaml-dev Section: ocaml Architecture: amd64 arm64 armhf ppc64el s390x riscv64 -Suggests: llvm-17-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-17-dev (= ${binary:Version}) +Suggests: llvm-18-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-18-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev Conflicts: libllvm-x.y-ocaml-dev Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev @@ -477,7 +477,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-17-doc +Package: llvm-18-doc Section: doc Architecture: all Depends: ${misc:Depends}, libjs-jquery, libjs-underscore @@ -496,10 +496,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-17-examples +Package: llvm-18-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-17-dev (>= ${source:Version}), llvm-17-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-18-dev (>= ${source:Version}), llvm-18-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 @@ -519,20 +519,20 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- -Package: lld-17 +Package: lld-18 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 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${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-17 +Package: liblld-18 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 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: LLVM-based linker, library @@ -542,12 +542,12 @@ Description: LLVM-based linker, library . This package contains the LLD runtime library. -Package: liblld-17-dev +Package: liblld-18-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 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lld-17 (= ${binary:Version}), - liblld-17 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lld-18 (= ${binary:Version}), + liblld-18 (= ${binary:Version}) 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 @@ -559,21 +559,21 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- -Package: lldb-17 +Package: lldb-18 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}) - python3-lldb-17 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}), + python3-lldb-18 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-17 +Package: liblldb-18 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: Next generation, high-performance debugger, library @@ -583,11 +583,11 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. -Package: python3-lldb-17 +Package: python3-lldb-18 Section: python Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-17 (= ${binary:Version}), python3-six +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-18 (= ${binary:Version}), python3-six Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y Provides: python3-lldb-x.y @@ -599,11 +599,11 @@ Description: Next generation, high-performance debugger, python3 lib . This binding package provides access to lldb. -Package: liblldb-17-dev +Package: liblldb-18-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-17 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-18 (= ${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 @@ -617,11 +617,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-17-dev +Package: libomp-18-dev Section: libdevel Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 -Depends: libomp5-17 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: libomp-17-doc +Depends: libomp5-18 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: libomp-18-doc Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) Provides: libomp-x.y-dev Conflicts: libomp-x.y-dev @@ -631,7 +631,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-17 +Package: libomp5-18 Multi-Arch: same Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} @@ -644,7 +644,7 @@ Description: LLVM OpenMP runtime linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp-17-doc +Package: libomp-18-doc Section: doc Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery @@ -659,7 +659,7 @@ Description: LLVM OpenMP runtime - Documentation # ------------- libcxx ------------- -Package: libc++1-17 +Package: libc++1-18 Section: libs Architecture: any Multi-Arch: same @@ -683,12 +683,12 @@ Description: LLVM C++ Standard library as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-17-dev +Package: libc++-18-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends}, - libunwind-17-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64] +Depends: libc++1-18 (= ${binary:Version}), ${misc:Depends}, + libunwind-18-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64] Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev @@ -706,11 +706,11 @@ Description: LLVM C++ Standard library (development files) as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-17-dev-wasm32 +Package: libc++-18-dev-wasm32 Section: libdevel Architecture: all Multi-Arch: foreign -Depends: wasi-libc, libc++abi-17-dev-wasm32, ${misc:Depends} +Depends: wasi-libc, libc++abi-18-dev-wasm32, ${misc:Depends} Provides: libc++-x.y-dev-wasm32 Conflicts: libc++-x.y-dev-wasm32 Replaces: libc++-x.y-dev-wasm32 @@ -731,7 +731,7 @@ Description: LLVM C++ Standard library (WASI) # ------------- libcxxabi ------------- -Package: libc++abi1-17 +Package: libc++abi1-18 Section: libs Architecture: any Multi-Arch: same @@ -750,11 +750,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-17-dev +Package: libc++abi-18-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++abi1-17 (= ${binary:Version}), ${misc:Depends} +Depends: libc++abi1-18 (= ${binary:Version}), ${misc:Depends} Breaks: libc++abi-dev (<= 44) Provides: libc++abi-x.y-dev Conflicts: libc++abi-x.y-dev @@ -768,7 +768,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-17-dev-wasm32 +Package: libc++abi-18-dev-wasm32 Section: libdevel Architecture: all Multi-Arch: foreign @@ -789,14 +789,14 @@ Description: LLVM low level support for a standard C++ library (WASI) # ------------- libclc ------------- -Package: libclc-17 +Package: libclc-18 Section: libs Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, - libclc-17-dev (= ${binary:Version}), - libclang-common-17-dev, + libclc-18-dev (= ${binary:Version}), + libclang-common-18-dev, Breaks: libclc-amdgcn, libclc-ptx, libclc-r600 Provides: libclc-x.y Conflicts: libclc-x.y @@ -808,7 +808,7 @@ Description: OpenCL C language implementation - platform support This package contains support for the amdgcn (AMD GPU), PTX and r600 platforms. -Package: libclc-17-dev +Package: libclc-18-dev Section: libdevel Architecture: all Multi-Arch: foreign @@ -826,7 +826,7 @@ Description: OpenCL C language implementation - development files # ------------- libunwind ------------- -Package: libunwind-17 +Package: libunwind-18 Section: libs Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 Multi-Arch: same @@ -843,13 +843,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-17-dev +Package: libunwind-18-dev Section: libdevel Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${misc:Depends}, - libunwind-17 (= ${binary:Version}) + libunwind-18 (= ${binary:Version}) Provides: libunwind-dev, libunwind-x.y-dev Conflicts: libunwind-dev, libunwind-x.y-dev Replaces: libunwind-dev, libunwind-x.y-dev @@ -863,7 +863,7 @@ Description: production-quality unwinder # ------------- mlir ------------- -Package: mlir-17-tools +Package: mlir-18-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Multi-Level Intermediate Representation tools @@ -874,7 +874,7 @@ Description: Multi-Level Intermediate Representation tools . This package provides tools. -Package: libmlir-17 +Package: libmlir-18 Section: libs Architecture: any Multi-Arch: same @@ -890,13 +890,13 @@ Description: Multi-Level Intermediate Representation library specific compilers, and aid in connecting existing compilers together. -Package: libmlir-17-dev +Package: libmlir-18-dev Section: libdevel Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libmlir-17 (= ${binary:Version}) + libmlir-18 (= ${binary:Version}) Breaks: libmlir-dev Provides: libmlir-x.y-dev Conflicts: libmlir-x.y-dev @@ -910,16 +910,16 @@ Description: Multi-Level Intermediate Representation library # ------------- bolt ------------- -Package: bolt-17 +Package: bolt-18 Architecture: amd64 # Disable on arm64 because libbolt_rt_hugify.a isn't generated -Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-17-dev (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-18-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-17-dev +Package: libbolt-18-dev Section: libdevel Architecture: amd64 #arm64 @@ -930,7 +930,7 @@ Description: Post-link optimizer # ------------- flang ------------- -Package: flang-17 +Package: flang-18 # no 32bit support # https://github.com/llvm/llvm-project/issues/59845 Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 @@ -943,7 +943,7 @@ Description: Fortran compiler While it is capable of generating executables for a number of examples, some functionalities are still missing. -Package: libflang-17-dev +Package: libflang-18-dev Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, From bf56ffb0821720fe61a05415284d2f9a961cde59 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 25 Jul 2023 18:27:35 +0200 Subject: [PATCH 002/302] Add timestamp --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c8f402c1..357d2c50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ llvm-toolchain-snapshot (1:18~++20230724083402+862b93a8095c-1~exp2) experimental * snapshot is now 18 - -- + -- Sylvestre Ledru Tue, 25 Jul 2023 18:27:26 +0200 llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium From e5b4df3b7dd8e4765d4ee658aa1ba07c88cbca57 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 26 Jul 2023 14:42:22 +0200 Subject: [PATCH 003/302] fix changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 357d2c50..fb8f41e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -llvm-toolchain-snapshot (1:18~++20230724083402+862b93a8095c-1~exp2) experimental; urgency=medium +llvm-toolchain-snapshot (1:18~++20230726024020+25b8433b7597-1~exp1) experimental; urgency=medium * snapshot is now 18 - -- Sylvestre Ledru Tue, 25 Jul 2023 18:27:26 +0200 + -- Sylvestre Ledru Wed, 26 Jul 2023 14:42:07 +0200 llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium From b5e66bb965843a78b7991a77c4ddff921356d95e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 26 Jul 2023 22:27:33 +0200 Subject: [PATCH 004/302] prepare release --- debian/changelog | 4 ++-- debian/unpack.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb8f41e1..3a0d561e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -llvm-toolchain-snapshot (1:18~++20230726024020+25b8433b7597-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:18~++20230726101950+e00e0b6fb004-1~exp1) UNRELEASED; urgency=medium * snapshot is now 18 - -- Sylvestre Ledru Wed, 26 Jul 2023 14:42:07 +0200 + -- Sylvestre Ledru Wed, 26 Jul 2023 22:27:14 +0200 llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium diff --git a/debian/unpack.sh b/debian/unpack.sh index 50beaf17..155dbc76 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -1,6 +1,6 @@ set -e ORIG_VERSION=snapshot -MAJOR_VERSION=17 # 8.0.1 +MAJOR_VERSION=18 # 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 9b7abbf12ee7c57d12488993c445b195b8d51755 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 5 Aug 2023 09:01:09 +0200 Subject: [PATCH 005/302] Remove llvm-remark-size-diff & llvm-tapi-diff from llvm-X.Y-dev --- debian/changelog | 5 +++-- debian/llvm-X.Y.install.in | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a0d561e..740dbd03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -llvm-toolchain-snapshot (1:18~++20230726101950+e00e0b6fb004-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:18~++20230726101950+e00e0b6fb004-1~exp2) UNRELEASED; urgency=medium * snapshot is now 18 + * Remove llvm-remark-size-diff & llvm-tapi-diff from llvm-X.Y-dev - -- Sylvestre Ledru Wed, 26 Jul 2023 22:27:14 +0200 + -- Sylvestre Ledru Sat, 05 Aug 2023 09:00:30 +0200 llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index 98cc13e3..a6b09d4e 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -49,7 +49,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/llvm-split usr/lib/llvm-@LLVM_VERSION@/bin/llvm-stress usr/lib/llvm-@LLVM_VERSION@/bin/llvm-strings usr/lib/llvm-@LLVM_VERSION@/bin/llvm-symbolizer -usr/lib/llvm-@LLVM_VERSION@/bin/llvm-tapi-diff usr/lib/llvm-@LLVM_VERSION@/bin/llvm-tblgen usr/lib/llvm-@LLVM_VERSION@/bin/llvm-undname usr/lib/llvm-@LLVM_VERSION@/bin/llvm-xray @@ -79,7 +78,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/sanstats usr/lib/llvm-@LLVM_VERSION@/bin/dsymutil usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod-find usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod -usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remark-size-diff usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remarkutil usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfo-analyzer @@ -144,7 +142,6 @@ usr/bin/llvm-stress-@LLVM_VERSION@ usr/bin/llvm-strings-@LLVM_VERSION@ usr/bin/llvm-strip-@LLVM_VERSION@ usr/bin/llvm-symbolizer-@LLVM_VERSION@ -usr/bin/llvm-tapi-diff-@LLVM_VERSION@ usr/bin/llvm-tblgen-@LLVM_VERSION@ usr/bin/llvm-undname-@LLVM_VERSION@ usr/bin/llvm-windres-@LLVM_VERSION@ @@ -160,5 +157,4 @@ usr/bin/sanstats-* usr/bin/dsymutil-* usr/bin/llvm-debuginfod-find-* usr/bin/llvm-debuginfod-@LLVM_VERSION@ -usr/bin/llvm-remark-size-diff-* usr/bin/llvm-debuginfo-analyzer-@LLVM_VERSION@ From d0d0b442df46d04461f9481b54ceef90b46007dd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 5 Aug 2023 09:04:10 +0200 Subject: [PATCH 006/302] Remove lldb-disable-swig-error.diff - no longer necessary --- debian/changelog | 1 + debian/patches/lldb/lldb-disable-swig-error.diff | 13 ------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 debian/patches/lldb/lldb-disable-swig-error.diff diff --git a/debian/changelog b/debian/changelog index 740dbd03..45ed1c94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-snapshot (1:18~++20230726101950+e00e0b6fb004-1~exp2) UNRELEASED; * snapshot is now 18 * Remove llvm-remark-size-diff & llvm-tapi-diff from llvm-X.Y-dev + * Remove lldb-disable-swig-error.diff - no longer necessary -- Sylvestre Ledru Sat, 05 Aug 2023 09:00:30 +0200 diff --git a/debian/patches/lldb/lldb-disable-swig-error.diff b/debian/patches/lldb/lldb-disable-swig-error.diff deleted file mode 100644 index 8d9d97fa..00000000 --- a/debian/patches/lldb/lldb-disable-swig-error.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/bindings/python/python.swig -=================================================================== ---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/lldb/bindings/python/python.swig -+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/bindings/python/python.swig -@@ -54,7 +54,7 @@ except ImportError: - %enddef - // These versions will not generate working python modules, so error out early. - #if SWIG_VERSION >= 0x030009 && SWIG_VERSION < 0x030011 --#error Swig versions 3.0.9 and 3.0.10 are incompatible with lldb. -+#warning Swig versions 3.0.9 and 3.0.10 are incompatible with lldb. - #endif - - // The name of the module to be created. diff --git a/debian/patches/series b/debian/patches/series index f2744617..6ad96d43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -54,7 +54,6 @@ fix-scan-view-path.diff lldb/lldb-link-atomic-cmake.patch lldb/lldb-addversion-suffix-to-llvm-server-exec.patch lldb/lldb-missing-install.diff -lldb/lldb-disable-swig-error.diff # Fix arch issue disable-error-xray.diff From 001870841bcd67b54ba08cb0a78f1536417f933b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 5 Aug 2023 10:08:25 +0000 Subject: [PATCH 007/302] Add llvm readtapi --- debian/llvm-X.Y.install.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index a6b09d4e..2a086b2e 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -80,6 +80,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod-find 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-readtap usr/bin/llvm-PerfectShuffle-@LLVM_VERSION@ usr/bin/llvm-addr2line-@LLVM_VERSION@ @@ -142,6 +143,7 @@ usr/bin/llvm-stress-@LLVM_VERSION@ usr/bin/llvm-strings-@LLVM_VERSION@ usr/bin/llvm-strip-@LLVM_VERSION@ usr/bin/llvm-symbolizer-@LLVM_VERSION@ +usr/bin/llvm-readtapi-@LLVM_VERSION@ usr/bin/llvm-tblgen-@LLVM_VERSION@ usr/bin/llvm-undname-@LLVM_VERSION@ usr/bin/llvm-windres-@LLVM_VERSION@ From bf2d3ab71232916a89c38cb3cf68e37747969dfd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 5 Aug 2023 11:37:28 +0000 Subject: [PATCH 008/302] Fix typo program --- debian/llvm-X.Y.install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index 2a086b2e..bf15d2e1 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -80,7 +80,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod-find 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-readtap +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-readtapi usr/bin/llvm-PerfectShuffle-@LLVM_VERSION@ usr/bin/llvm-addr2line-@LLVM_VERSION@ From 15a65a89f80aef35c30de6542799787808eaa3e3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 18 Aug 2023 18:49:45 +0200 Subject: [PATCH 009/302] update of patch which didn't update 17 => 18 --- debian/patches/clang-analyzer-force-version.diff | 4 ++-- debian/patches/clang-format-version.diff | 6 +++--- debian/patches/clang-tidy-run-bin.diff | 4 ++-- debian/patches/fix-scan-view-path.diff | 2 +- debian/patches/python-clangpath.diff | 2 +- debian/patches/scan-build-clang-path.diff | 2 +- debian/patches/scan-build-py-fix-default-bin.diff | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index f364728c..72b34451 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++-17'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-18'; } $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-17'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-18'; } $IsCXX = 0 } diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index f2719282..5e00d38c 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-17", ++ default="clang-format-18", 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-17") ++ (or (executable-find "clang-format-18") "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-17" ++binary = "clang-format-18" 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 ed7637a4..6d56590b 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -8,12 +8,12 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extr parser.add_argument( - "-clang-tidy-binary", metavar="PATH", help="path to clang-tidy binary" + "-clang-tidy-binary", metavar="PATH", -+ default='clang-tidy-17', ++ default='clang-tidy-18', + help="path to clang-tidy binary" ) parser.add_argument( "-clang-apply-replacements-binary", -+ default='clang-apply-replacements-17', ++ default='clang-apply-replacements-18', 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 ee310efe..c371314d 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -6,7 +6,7 @@ Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan- kMaxPortsToTry = 100 ### -+BASE_DIR = '/usr/share/clang/scan-view-17' ++BASE_DIR = '/usr/share/clang/scan-view-18' def url_is_up(url): diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index ce679260..7efb1df0 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-17.so" ++ file = "libclang-18.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 cbc11e45..1876f348 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-17/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-18/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 d2a3742d..0f194578 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-17", ++ default="clang-18", 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.""", From 4177f52877b780ac2fa6279d2f257a32a56eb7d1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 20 Aug 2023 11:24:30 +0200 Subject: [PATCH 010/302] also disable the python3 lldb binding on bionic --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 12876980..222e60bf 100755 --- a/debian/rules +++ b/debian/rules @@ -1200,7 +1200,7 @@ endif # Disable the python binding for buster. not sure why it regressed # regressed de4364f1ecaa..0745b0c0354a - if test "$(DISTRO)" = "buster"; then \ + if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic"; then \ mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \ touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \ echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \ From d3ec781b406024434a65d32dcb605691320cb69b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 18 Aug 2023 16:02:00 +0200 Subject: [PATCH 011/302] fix the version --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 45ed1c94..44b54953 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -llvm-toolchain-snapshot (1:18~++20230726101950+e00e0b6fb004-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:18~++20230818040015+c931f2e6fd0c-1~exp1) experimental; urgency=medium * snapshot is now 18 * Remove llvm-remark-size-diff & llvm-tapi-diff from llvm-X.Y-dev * Remove lldb-disable-swig-error.diff - no longer necessary - -- Sylvestre Ledru Sat, 05 Aug 2023 09:00:30 +0200 + -- Sylvestre Ledru Fri, 18 Aug 2023 16:00:36 +0200 llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium From 24222f001371b7b4246bed70c1197a93586d35dc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 28 Aug 2023 18:34:02 +0200 Subject: [PATCH 012/302] rebase of the patches --- .../23-strlcpy_strlcat_warning_removed.diff | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 4e95100f..be74dd9e 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_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def +--- 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") @@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/cl 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") -@@ -1179,8 +1179,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", +@@ -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 @@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/cl // 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_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp -@@ -4274,13 +4274,13 @@ unsigned FunctionDecl::getMemoryFunction +--- 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 case Builtin::BImemmove: return Builtin::BImemmove; @@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp -@@ -1265,8 +1265,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- 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 case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memset_chk: @@ -72,7 +72,7 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -6744,10 +6744,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -6964,10 +6964,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -85,10 +85,10 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/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 {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, @@ -102,11 +102,11 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Static {{CDF_MaybeBuiltin, {{"snprintf"}}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, {{CDF_MaybeBuiltin, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c -@@ -197,12 +197,10 @@ void test18(void) { +--- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/builtins.c +@@ -195,12 +195,10 @@ void test18(void) { void *ptr; ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst)); @@ -119,26 +119,28 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/ } void no_ms_builtins(void) { -@@ -216,6 +214,7 @@ void unavailable(void) { +@@ -214,7 +212,8 @@ void unavailable(void) { __builtin_operator_delete(0); // expected-error {{'__builtin_operator_delete' is only available in C++}} } +-size_t strlcpy(char * restrict dst, const char * restrict src, size_t size); +/* - // rdar://18259539 - size_t strlcpy(char * restrict dst, const char * restrict src, size_t size); ++ size_t strlcpy(char * restrict dst, const char * restrict src, size_t size); size_t strlcat(char * restrict dst, const char * restrict src, size_t size); -@@ -238,6 +237,7 @@ void Test19(void) + + void Test19(void) +@@ -235,6 +234,7 @@ void Test19(void) // expected-note {{change size argument to be the size of the destination}} \ // expected-warning {{'strlcat' will always overflow; destination buffer has size 20, but size argument is 40}} } +*/ - // rdar://11076881 char * Test20(char *p, const char *in, unsigned n) -Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/warn-strlcpycat-size.c + { +Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/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 @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - From a87dd6d3437896aa960e198f9128a706b4bc7a53 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 30 Aug 2023 11:49:41 +0200 Subject: [PATCH 013/302] Disable wasm support on powerpc and powerpcspe --- debian/changelog | 7 +++++++ debian/rules | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 44b54953..4544b402 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:18~++20230818040015+c931f2e6fd0c-1~exp2) UNRELEASED; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Disable wasm support on powerpc and powerpcspe + + -- John Paul Adrian Glaubitz Wed, 30 Aug 2023 11:49:01 +0200 + llvm-toolchain-snapshot (1:18~++20230818040015+c931f2e6fd0c-1~exp1) experimental; urgency=medium * snapshot is now 18 diff --git a/debian/rules b/debian/rules index 222e60bf..b6b9e244 100755 --- a/debian/rules +++ b/debian/rules @@ -409,6 +409,10 @@ ifeq (,$(filter-out $(LIBCXX_WASM_DISABLE_DISTRO), $(DISTRO))) LIBCXX_WASM_ENABLE=no endif +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe)) + LIBCXX_WASM_ENABLE=no +endif + LLD_ENABLE=yes ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux)) From 9fd0d44add4c660d93129e5efe3e449133c11f3a Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 30 Aug 2023 11:50:12 +0200 Subject: [PATCH 014/302] Remove powerpc from BINUTILS_GOLD_ARCHS again --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4544b402..f8a8efd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-snapshot (1:18~++20230818040015+c931f2e6fd0c-1~exp2) UNRELEASED; [ John Paul Adrian Glaubitz ] * Disable wasm support on powerpc and powerpcspe + * Remove powerpc from BINUTILS_GOLD_ARCHS again -- John Paul Adrian Glaubitz Wed, 30 Aug 2023 11:49:01 +0200 diff --git a/debian/rules b/debian/rules index b6b9e244..de83f2d5 100755 --- a/debian/rules +++ b/debian/rules @@ -271,7 +271,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 powerpc hurd-i386 kfreebsd-amd64 kfreebsd-i386 +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 549f57389593d5be236395447bc92ff98e6d70eb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Sep 2023 00:22:42 +0200 Subject: [PATCH 015/302] fix the merge --- debian/changelog | 19 +++++++++++++++++++ debian/control | 2 +- debian/rules | 5 +++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8cf89ec4..853faefb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 ] @@ -14,6 +21,12 @@ llvm-toolchain-snapshot (1:18~++20230818040015+c931f2e6fd0c-1~exp1) experimental -- Sylvestre Ledru Fri, 18 Aug 2023 16:00:36 +0200 +llvm-toolchain-snapshot (1:18~++20230725115106+b6847edfc235-1~exp1) experimental; urgency=medium + + * snapshot is now 18 + + -- Sylvestre Ledru Tue, 25 Jul 2023 23:52:42 +0200 + llvm-toolchain-17 (1:17.0.0~+rc4-1~exp2) experimental; urgency=medium * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22 @@ -57,6 +70,12 @@ llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium -- Sylvestre Ledru Tue, 15 Aug 2023 19:25:12 +0000 +llvm-toolchain-snapshot (1:17~++20230723074821+3ebe606592fb-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + + -- Sylvestre Ledru Sun, 23 Jul 2023 19:48:42 +0200 + llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental; urgency=medium * Install usr/lib/llvm-17/lib/clang/17/include/llvm_libc_wrappers/*.h diff --git a/debian/control b/debian/control index 22b35729..6fdb1fa9 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-17 +Source: llvm-toolchain-snapshot Section: devel Priority: optional Rules-Requires-Root: no diff --git a/debian/rules b/debian/rules index 9056973a..bde2151c 100755 --- a/debian/rules +++ b/debian/rules @@ -1076,6 +1076,11 @@ ifeq (${LIBFUZZER_ENABLE},yes) cp -v $(TARGET_BUILD)/libFuzzer.a $(CURDIR)/debian/libfuzzer-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/ endif +# Because of hurd, we are more flexible in what we include in libclang-X.Y-rt +# but we don't want to install wasi files into libclang-rt as they have their own package +# So, we remove this directory from the package + rm -f $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/wasi/ + # Create this fake directory to make the install libclang-common-dev happy # under the unsupported archs of compiler-rt mkdir -p $(DEB_INST)/usr/lib/clang/$(LLVM_VERSION)/lib From 70e2346cd1a69b95784544b9620382d613de5369 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Sep 2023 13:03:59 +0200 Subject: [PATCH 016/302] fix the vcs link --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 6fdb1fa9..52de2410 100644 --- a/debian/control +++ b/debian/control @@ -35,8 +35,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 17 -Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17 +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 # ------------- clang ------------- From 7be4584e0a5dc81ff589f1df1d2d6e8cffecdb8e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Sep 2023 13:20:12 +0200 Subject: [PATCH 017/302] Refresh the cotrol --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 52de2410..d31cb193 100644 --- a/debian/control +++ b/debian/control @@ -687,8 +687,8 @@ Package: libc++-18-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends}, - libunwind-17-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64] +Depends: libc++1-18 (= ${binary:Version}), ${misc:Depends}, + libunwind-18-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64] Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev @@ -934,7 +934,7 @@ Package: flang-18 # no 32bit support # https://github.com/llvm/llvm-project/issues/59845 Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-16-dev (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-18-dev (= ${binary:Version}), Provides: fortran-compiler, gfortran-mod-15 Description: Fortran compiler Ground-up implementation of a Fortran front end written in From 86550e92b9abb3ed09780ce6aa02a903b45ac388 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Sep 2023 17:37:00 +0200 Subject: [PATCH 018/302] fix changelog --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dcd7ce22..5d20bf89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ 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 From 0372d41b13184a84f1813ef564b6bdea3da9eb14 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 10 Sep 2023 17:27:02 +0200 Subject: [PATCH 019/302] New snapshot release --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 18872535..696e868f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -llvm-toolchain-snapshot (1:18~++20230907020249+c16adb0dcb1f-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:18~++20230910052457+7560356a832f-1~exp1) experimental; urgency=medium - * experimental New snapshot release + * New snapshot release - -- Sylvestre Ledru Thu, 07 Sep 2023 14:04:25 +0200 + -- Sylvestre Ledru Sun, 10 Sep 2023 17:26:28 +0200 llvm-toolchain-snapshot (1:18~++20230818040015+c931f2e6fd0c-1~exp2) UNRELEASED; urgency=medium From 221deb828fd3078c94734827b23cebac10b8bd60 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 10 Sep 2023 19:18:43 +0200 Subject: [PATCH 020/302] Make sure we use at least spirv 17, FTBFS otherwise --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 036ab2e2..61667530 100755 --- a/debian/rules +++ b/debian/rules @@ -259,7 +259,7 @@ endif ifndef LLVM_SPIRV LLVM_SPIRV_INSTALLED = no else - ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 14.0.0 ; echo $$?),0) + ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 17.0.0 ; echo $$?),0) # Too old llvm-spirv version are failing. See #52200 LLVM_SPIRV_INSTALLED = yes else From 2b44ee3a5ea179a1aae30ad3806e2aa3c3ef99cd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 12 Sep 2023 13:18:50 +0200 Subject: [PATCH 021/302] rebase of the patch --- debian/patches/lldb/print-lldb-path.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/lldb/print-lldb-path.patch b/debian/patches/lldb/print-lldb-path.patch index b9bb3b79..f325acd4 100644 --- a/debian/patches/lldb/print-lldb-path.patch +++ b/debian/patches/lldb/print-lldb-path.patch @@ -1,19 +1,19 @@ Author: Gianfranco Costamagna Last-Update: 2023-01-19 -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py +Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/bindings/python/get-python-config.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/bindings/python/get-python-config.py -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py -@@ -15,6 +15,7 @@ def relpath_nodots(path, base): - return rel +--- 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 +@@ -16,6 +16,7 @@ def relpath_nodots(path, base): + def main(): + import sysconfig parser = argparse.ArgumentParser(description="extract cmake variables from python") parser.add_argument("variable_name") args = parser.parse_args() -@@ -31,7 +32,19 @@ def main(): +@@ -32,7 +33,19 @@ def main(): # If not, you'll have to use lldb -P or lldb -print-script-interpreter-info # to figure out where it is. try: @@ -34,10 +34,10 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/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_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +Index: llvm-toolchain-snapshot_18~++20230912011735+4793c2c3de79/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +--- 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 // the real python interpreter uses. (e.g. lib for most, lib64 on RHEL // x86_64, or bin on Windows). From 688e280cecd0667b1479c24c8f823d7d80ebfa5a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 21 Sep 2023 13:39:56 +0200 Subject: [PATCH 022/302] remove patch (test no longer exist) --- debian/patches/series | 1 - debian/patches/silent-amd-tet.diff | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 debian/patches/silent-amd-tet.diff diff --git a/debian/patches/series b/debian/patches/series index c705529d..a58f5b2a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,7 +35,6 @@ silent-more-tests.diff silent-MCJIIT-tests.diff silent-gold-utils.diff silent-test-failing-codeverage.diff -silent-amd-tet.diff silent-test-macho.diff silent-llvm-isel-fuzzer.diff remove-test-freezing.diff diff --git a/debian/patches/silent-amd-tet.diff b/debian/patches/silent-amd-tet.diff deleted file mode 100644 index d9584a85..00000000 --- a/debian/patches/silent-amd-tet.diff +++ /dev/null @@ -1,11 +0,0 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/test/MC/AMDGPU/hsa.s -=================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/test/MC/AMDGPU/hsa.s -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/test/MC/AMDGPU/hsa.s -@@ -1,5 +1,6 @@ - // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri --amdhsa-code-object-version=2 -show-encoding %s | FileCheck %s --check-prefix=ASM - // RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri --amdhsa-code-object-version=2 -show-encoding %s | llvm-readobj --symbols -S --sd - | FileCheck %s --check-prefix=ELF -+// XFAIL: * - - // ELF: Section { - // ELF: Name: .text From 602486a66de5489188c9aaa99b82356b06592cbb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 25 Sep 2023 21:52:31 +0200 Subject: [PATCH 023/302] replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d68f0c64..205c4946 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium + + * replace python3-recommonmark by myst-parser + to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 + + -- Sylvestre Ledru Mon, 25 Sep 2023 21:51:52 +0200 + llvm-toolchain-snapshot (1:18~++20230910052457+7560356a832f-1~exp1) experimental; urgency=medium * New snapshot release diff --git a/debian/control b/debian/control index b14a766a..e3b3fb3f 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-recommonmark, + libjs-mathjax, python3-myst-parser, 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 c070c942..3955b171 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-recommonmark, + libjs-mathjax, python3-myst-parser, 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 725d3752cabee46091eaf717fdc4bf24c8e7e635 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 27 Sep 2023 15:04:48 +0200 Subject: [PATCH 024/302] still try to install python3-recommonmark on old distro --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index e3b3fb3f..fc98ce3f 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, + libjs-mathjax, python3-myst-parser | python3-recommonmark, 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 3955b171..9e13f804 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, + libjs-mathjax, python3-myst-parser | python3-recommonmark, 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 415af43d6b0ab10d90d091e7956a5b40670e7a90 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 28 Sep 2023 21:11:51 +0200 Subject: [PATCH 025/302] rebase of the patch --- debian/patches/hurd/hurd-pathmax.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff index c8939dd8..fcf3bde4 100644 --- a/debian/patches/hurd/hurd-pathmax.diff +++ b/debian/patches/hurd/hurd-pathmax.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/lib/Basic/FileManager.cpp +Index: llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/clang/lib/Basic/FileManager.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/lib/Basic/FileManager.cpp -+++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/lib/Basic/FileManager.cpp -@@ -610,6 +610,12 @@ FileManager::getNoncachedStatValue(Strin +--- 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 return std::error_code(); } @@ -13,12 +13,12 @@ Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/lib/Basic/ + + void FileManager::GetUniqueIDMapping( - SmallVectorImpl &UIDToFiles) const { + SmallVectorImpl &UIDToFiles) const { UIDToFiles.clear(); -Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/lldb/include/lldb/lldb-defines.h +Index: llvm-toolchain-snapshot_18~++20230928085653+a7f962c00745/lldb/include/lldb/lldb-defines.h =================================================================== ---- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/lldb/include/lldb/lldb-defines.h -+++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/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 @@ -15,6 +15,11 @@ #define INT32_MAX 2147483647 #endif From ed11684ffef7ea9b517ed2586272173d54ca7af3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 29 Sep 2023 09:44:23 +0200 Subject: [PATCH 026/302] disable the doc on old distro --- debian/changelog | 1 + debian/rules | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 205c4946..e48c1959 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 + And disable generation of the doc on old distro -- Sylvestre Ledru Mon, 25 Sep 2023 21:51:52 +0200 diff --git a/debian/rules b/debian/rules index 61667530..2210a83f 100755 --- a/debian/rules +++ b/debian/rules @@ -412,6 +412,13 @@ ifeq (,$(filter-out $(LIBCXX_WASM_DISABLE_DISTRO), $(DISTRO))) LIBCXX_WASM_ENABLE=no endif +DOC_GENERATION=yes +DOC_GENERATION_DISTRO := buster bullseye bionic focal +# LLVM upstream moved to myst_parser but it isn't available on old distro +ifeq (,$(filter-out $(DISABLE_DOC_GENERATION_DISTRO), $(DISTRO))) + DOC_GENERATION=no +endif + ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe)) LIBCXX_WASM_ENABLE=no endif @@ -967,6 +974,10 @@ override_dh_auto_build: \ override_dh_prep: build_doc dh_prep +ifeq ($(DOC_GENERATION), no) +build_doc: + @echo "Don't build doc on this distro $(DISTRO)" +else build_doc: BUILDDIR="_build"; \ ALLSPHINXOPTS="-d $$BUILDDIR/doctrees ."; \ @@ -1028,6 +1039,7 @@ endif cd openmp/runtime/doc/doxygen/generated/html/ && rm jquery.js && ln -s /usr/share/javascript/jquery/jquery.js; \ fi touch $@ +endif override_dh_auto_install: # Clean up temporary files to make sure the install works From c5f71d0fa5f727a34ceef9ad0c8a24165d4a532e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 29 Sep 2023 12:09:40 +0200 Subject: [PATCH 027/302] debug info: show when we are not building the doc --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 2210a83f..25c5a406 100755 --- a/debian/rules +++ b/debian/rules @@ -565,6 +565,7 @@ preconfigure: @echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)" @echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)" @echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)" + @echo "DOC_GENERATION=$(DOC_GENERATION)" for f in debian/*.in; do \ f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ From 14d8e0f7baf36716e2f1bcf4f700154e58c553b3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 29 Sep 2023 13:26:01 +0200 Subject: [PATCH 028/302] fix variable usage --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 25c5a406..29e5960f 100755 --- a/debian/rules +++ b/debian/rules @@ -415,7 +415,7 @@ endif DOC_GENERATION=yes DOC_GENERATION_DISTRO := buster bullseye bionic focal # LLVM upstream moved to myst_parser but it isn't available on old distro -ifeq (,$(filter-out $(DISABLE_DOC_GENERATION_DISTRO), $(DISTRO))) +ifeq (,$(filter-out $(DOC_GENERATION_DISTRO), $(DISTRO))) DOC_GENERATION=no endif From 3c9e2699fab4fe6949795de60b876980c360e38d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Sep 2023 09:00:02 +0200 Subject: [PATCH 029/302] build without doc: create an empty directory to please him --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 29e5960f..472a5957 100755 --- a/debian/rules +++ b/debian/rules @@ -977,6 +977,7 @@ override_dh_prep: build_doc ifeq ($(DOC_GENERATION), no) build_doc: + mkdir -p $(CURDIR)/tools/clang/stage2-bins/docs/ocamldoc/html/ @echo "Don't build doc on this distro $(DISTRO)" else build_doc: From f2ce61597663a525d68ccb641b7c3dba51168b87 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Sep 2023 09:15:55 +0200 Subject: [PATCH 030/302] Also install readtapi => llvm-readtapi symlink See https://github.com/llvm/llvm-project/pull/67748 --- debian/changelog | 1 + debian/llvm-X.Y.install.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index e48c1959..28fcf782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 And disable generation of the doc on old distro + * Also install readtapi => llvm-readtapi symlink -- Sylvestre Ledru Mon, 25 Sep 2023 21:51:52 +0200 diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index bf15d2e1..8e11c00f 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/readtapi usr/bin/llvm-PerfectShuffle-@LLVM_VERSION@ usr/bin/llvm-addr2line-@LLVM_VERSION@ @@ -144,6 +145,7 @@ usr/bin/llvm-strings-@LLVM_VERSION@ usr/bin/llvm-strip-@LLVM_VERSION@ usr/bin/llvm-symbolizer-@LLVM_VERSION@ usr/bin/llvm-readtapi-@LLVM_VERSION@ +usr/bin/readtapi-@LLVM_VERSION@ usr/bin/llvm-tblgen-@LLVM_VERSION@ usr/bin/llvm-undname-@LLVM_VERSION@ usr/bin/llvm-windres-@LLVM_VERSION@ From c50a4f0201bf4b4baf01fde81071b900245078f7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Sep 2023 09:39:23 +0200 Subject: [PATCH 031/302] ocamldoc: fix the path --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 472a5957..b4cf12e3 100755 --- a/debian/rules +++ b/debian/rules @@ -977,7 +977,7 @@ override_dh_prep: build_doc ifeq ($(DOC_GENERATION), no) build_doc: - mkdir -p $(CURDIR)/tools/clang/stage2-bins/docs/ocamldoc/html/ + mkdir -p $(TARGET_BUILD)/tools/clang/stage2-bins/docs/ocamldoc/html/ @echo "Don't build doc on this distro $(DISTRO)" else build_doc: From 02475ae43677d0306af14c42d40ae1496606968d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Sep 2023 10:54:19 +0200 Subject: [PATCH 032/302] only copy the doc if we generate it --- debian/rules | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index b4cf12e3..8bbcc3e1 100755 --- a/debian/rules +++ b/debian/rules @@ -1210,9 +1210,11 @@ endif fi mkdir -p $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/ $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/ - cp -R $(TARGET_BUILD_STAGE2)/docs/html $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/ - cp -R $(TARGET_BUILD_STAGE2)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/ - cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra + if test "$(DOC_GENERATION)" = yes; then \ + cp -R $(TARGET_BUILD_STAGE2)/docs/html $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/; \ + cp -R $(TARGET_BUILD_STAGE2)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/; \ + cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra; \ + fi # Rename OCaml bindings if test "$(OCAML_ENABLE)" = yes; then \ From 64b426828884ae3501eb6548b200ce10ab08b082 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Sep 2023 11:09:09 +0200 Subject: [PATCH 033/302] missing tab.... --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8bbcc3e1..d143138b 100755 --- a/debian/rules +++ b/debian/rules @@ -1210,7 +1210,7 @@ endif fi mkdir -p $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/ $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/ - if test "$(DOC_GENERATION)" = yes; then \ + if test "$(DOC_GENERATION)" = yes; then \ cp -R $(TARGET_BUILD_STAGE2)/docs/html $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/; \ cp -R $(TARGET_BUILD_STAGE2)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/; \ cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra; \ From d795a4831e2e90cad737a96a37eb3f904d4659da Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Sep 2023 11:48:54 +0200 Subject: [PATCH 034/302] remove old doc files --- debian/llvm-X.Y-doc.install.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/debian/llvm-X.Y-doc.install.in b/debian/llvm-X.Y-doc.install.in index a84b0423..aaafde92 100644 --- a/debian/llvm-X.Y-doc.install.in +++ b/debian/llvm-X.Y-doc.install.in @@ -1,6 +1 @@ llvm/docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/ -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc.tar.gz -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/doxygen.css -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html From f086896c2be4226580d609476632b2faa74ec3ab Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Sep 2023 11:49:09 +0200 Subject: [PATCH 035/302] create a fake directory to please it --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index d143138b..c61fcf2c 100755 --- a/debian/rules +++ b/debian/rules @@ -1214,6 +1214,8 @@ endif cp -R $(TARGET_BUILD_STAGE2)/docs/html $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/; \ cp -R $(TARGET_BUILD_STAGE2)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/; \ cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra; \ + else \ + mkdir -p llvm/docs/_build/html; \ fi # Rename OCaml bindings From cb083f835b7b9594373b31ce8c12d00e3969e5b1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Sep 2023 13:55:28 +0200 Subject: [PATCH 036/302] create more fake dirs --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c61fcf2c..1964fd86 100755 --- a/debian/rules +++ b/debian/rules @@ -1215,7 +1215,7 @@ endif cp -R $(TARGET_BUILD_STAGE2)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/; \ cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra; \ else \ - mkdir -p llvm/docs/_build/html; \ + mkdir -p llvm/docs/_build/html clang/docs/_build/html/ tools/clang/tools/extra/docs/html; \ fi # Rename OCaml bindings From 448b02b46ddf6ceaa1098669b585687eb7b91c53 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Sep 2023 14:57:17 +0200 Subject: [PATCH 037/302] create more fake dirs --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 1964fd86..6a38075b 100755 --- a/debian/rules +++ b/debian/rules @@ -1215,7 +1215,7 @@ endif cp -R $(TARGET_BUILD_STAGE2)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/; \ cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra; \ else \ - mkdir -p llvm/docs/_build/html clang/docs/_build/html/ tools/clang/tools/extra/docs/html; \ + mkdir -p llvm/docs/_build/html clang/docs/_build/html/ tools/clang/tools/extra/docs/html openmp/runtime/doc/doxygen/generated/html/; \ fi # Rename OCaml bindings From 0db161fe8f01519a2b659cce523be0e4ffb8bef9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 1 Oct 2023 19:06:53 +0200 Subject: [PATCH 038/302] When building flang, add -DLLVM_INSTALL_GTEST=On. See https://reviews.llvm.org/D154869 --- debian/changelog | 2 ++ debian/rules | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 28fcf782..d9924ab2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 And disable generation of the doc on old distro * Also install readtapi => llvm-readtapi symlink + * When building flang, add -DLLVM_INSTALL_GTEST=On. + See https://reviews.llvm.org/D154869 -- Sylvestre Ledru Mon, 25 Sep 2023 21:51:52 +0200 diff --git a/debian/rules b/debian/rules index 6a38075b..faaae018 100755 --- a/debian/rules +++ b/debian/rules @@ -289,6 +289,7 @@ endif # flang is only for 64bits ifneq (,$(filter flang-$(LLVM_VERSION), $(shell dh_listpackages))) PROJECTS += ;flang + STAGE_ALL_CMAKE_EXTRA += -DLLVM_INSTALL_GTEST=On endif CODECOVERAGE=no From 13c3c4f74f2733477669f50a4abcffd7f11cede9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Oct 2023 13:48:28 +0200 Subject: [PATCH 039/302] flang-rt has been reverted Revert "When building flang, add -DLLVM_INSTALL_GTEST=On. See https://reviews.llvm.org/D154869" This reverts commit 0db161fe8f01519a2b659cce523be0e4ffb8bef9. --- debian/changelog | 2 -- debian/rules | 1 - 2 files changed, 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d9924ab2..28fcf782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,6 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 And disable generation of the doc on old distro * Also install readtapi => llvm-readtapi symlink - * When building flang, add -DLLVM_INSTALL_GTEST=On. - See https://reviews.llvm.org/D154869 -- Sylvestre Ledru Mon, 25 Sep 2023 21:51:52 +0200 diff --git a/debian/rules b/debian/rules index faaae018..6a38075b 100755 --- a/debian/rules +++ b/debian/rules @@ -289,7 +289,6 @@ endif # flang is only for 64bits ifneq (,$(filter flang-$(LLVM_VERSION), $(shell dh_listpackages))) PROJECTS += ;flang - STAGE_ALL_CMAKE_EXTRA += -DLLVM_INSTALL_GTEST=On endif CODECOVERAGE=no From e9483b8bfed307814b655e347a9a0bedcf964262 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Oct 2023 14:37:14 +0200 Subject: [PATCH 040/302] create fake files --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 6a38075b..393bc900 100755 --- a/debian/rules +++ b/debian/rules @@ -1216,6 +1216,7 @@ endif cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra; \ else \ mkdir -p llvm/docs/_build/html clang/docs/_build/html/ tools/clang/tools/extra/docs/html openmp/runtime/doc/doxygen/generated/html/; \ + touch clang/docs/_build/man/clang-$(LLVM_VERSION).1 debian/man/lldb-$(LLVM_VERSION).1 debian/man/clang-format-diff-$(LLVM_VERSION).1 debian/man/clangd-$(LLVM_VERSION).1 llvm/docs/_build/man/foo.1; \ fi # Rename OCaml bindings From 3779a1e99b8264fe5b4b760b1a301d305644bea8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Oct 2023 22:31:10 +0200 Subject: [PATCH 041/302] create the dir for the fake files --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 393bc900..8f67a314 100755 --- a/debian/rules +++ b/debian/rules @@ -1215,7 +1215,7 @@ endif cp -R $(TARGET_BUILD_STAGE2)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/; \ cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra; \ else \ - mkdir -p llvm/docs/_build/html clang/docs/_build/html/ tools/clang/tools/extra/docs/html openmp/runtime/doc/doxygen/generated/html/; \ + mkdir -p llvm/docs/_build/html clang/docs/_build/html/ tools/clang/tools/extra/docs/html openmp/runtime/doc/doxygen/generated/html/ debian/man/ clang/docs/_build/man/ llvm/docs/_build/man/; \ touch clang/docs/_build/man/clang-$(LLVM_VERSION).1 debian/man/lldb-$(LLVM_VERSION).1 debian/man/clang-format-diff-$(LLVM_VERSION).1 debian/man/clangd-$(LLVM_VERSION).1 llvm/docs/_build/man/foo.1; \ fi From 11601aaf053423d61003b0ca64e4f067c27f4cad Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 5 Oct 2023 00:15:12 +0200 Subject: [PATCH 042/302] more fake files --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8f67a314..f4980134 100755 --- a/debian/rules +++ b/debian/rules @@ -1216,7 +1216,7 @@ endif cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra; \ else \ mkdir -p llvm/docs/_build/html clang/docs/_build/html/ tools/clang/tools/extra/docs/html openmp/runtime/doc/doxygen/generated/html/ debian/man/ clang/docs/_build/man/ llvm/docs/_build/man/; \ - touch clang/docs/_build/man/clang-$(LLVM_VERSION).1 debian/man/lldb-$(LLVM_VERSION).1 debian/man/clang-format-diff-$(LLVM_VERSION).1 debian/man/clangd-$(LLVM_VERSION).1 llvm/docs/_build/man/foo.1; \ + touch clang/docs/_build/man/clang-$(LLVM_VERSION).1 debian/man/lldb-$(LLVM_VERSION).1 debian/man/clang-format-diff-$(LLVM_VERSION).1 debian/man/clangd-$(LLVM_VERSION).1 llvm/docs/_build/man/foo.1 debian/man/llvm-dwarfdump-$(LLVM_VERSION).1 debian/man/lli-$(LLVM_VERSION).1 debian/man/clang-check-$(LLVM_VERSION).1; \ fi # Rename OCaml bindings From 358d292008b1fdf1f46abfa2c7ab7db5ff80387b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 5 Oct 2023 14:05:05 +0200 Subject: [PATCH 043/302] delete the manpage install when not building with the doc --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f4980134..60716398 100755 --- a/debian/rules +++ b/debian/rules @@ -1216,7 +1216,7 @@ endif cp -R $(TARGET_BUILD_STAGE2)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra; \ else \ mkdir -p llvm/docs/_build/html clang/docs/_build/html/ tools/clang/tools/extra/docs/html openmp/runtime/doc/doxygen/generated/html/ debian/man/ clang/docs/_build/man/ llvm/docs/_build/man/; \ - touch clang/docs/_build/man/clang-$(LLVM_VERSION).1 debian/man/lldb-$(LLVM_VERSION).1 debian/man/clang-format-diff-$(LLVM_VERSION).1 debian/man/clangd-$(LLVM_VERSION).1 llvm/docs/_build/man/foo.1 debian/man/llvm-dwarfdump-$(LLVM_VERSION).1 debian/man/lli-$(LLVM_VERSION).1 debian/man/clang-check-$(LLVM_VERSION).1; \ + rm debian/*$(LLVM_VERSION)*manpages; \ fi # Rename OCaml bindings From c5efc4b664000d1edf6161dc6ee8ff2b5cee4b23 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 7 Oct 2023 17:39:42 +0200 Subject: [PATCH 044/302] Ship tblgen-to-irdl as part of mlir-tools --- debian/changelog | 1 + debian/mlir-X.Y-tools.install.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 28fcf782..4a6eaff4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 And disable generation of the doc on old distro * Also install readtapi => llvm-readtapi symlink + * Ship tblgen-to-irdl as part of mlir-tools -- Sylvestre Ledru Mon, 25 Sep 2023 21:51:52 +0200 diff --git a/debian/mlir-X.Y-tools.install.in b/debian/mlir-X.Y-tools.install.in index 4fb7ce21..497246fa 100644 --- a/debian/mlir-X.Y-tools.install.in +++ b/debian/mlir-X.Y-tools.install.in @@ -1,5 +1,7 @@ usr/bin/mlir-* usr/bin/tblgen-lsp-server-@LLVM_VERSION@ +usr/bin/tblgen-to-irdl-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/bin/mlir-* usr/lib/llvm-@LLVM_VERSION@/bin/tblgen-lsp-server +usr/lib/llvm-@LLVM_VERSION@/bin/tblgen-to-irdl From de4010878c9de22ca2dde568852d725fa0e4f996 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Oct 2023 08:14:00 +0200 Subject: [PATCH 045/302] [ Matthias Klose ] * Consolidate the build flags for the wasm builds. * Disable the clc and wasm builds when not building binary indep packages. * Limit the parallel links to 2 on riscv64. --- debian/changelog | 8 +++++++- debian/rules | 21 ++++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4a6eaff4..03a1937d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 And disable generation of the doc on old distro * Also install readtapi => llvm-readtapi symlink * Ship tblgen-to-irdl as part of mlir-tools - -- Sylvestre Ledru Mon, 25 Sep 2023 21:51:52 +0200 + [ Matthias Klose ] + * Consolidate the build flags for the wasm builds. + * Disable the clc and wasm builds when not building binary indep packages. + * Limit the parallel links to 2 on riscv64. + + -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 llvm-toolchain-snapshot (1:18~++20230910052457+7560356a832f-1~exp1) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index 60716398..a5540cd9 100755 --- a/debian/rules +++ b/debian/rules @@ -195,6 +195,7 @@ endif # debug symbols OOM in Ubuntu Ubuntu and slows down build process. ifneq (,$(filter $(DEB_HOST_ARCH),riscv64)) opt_flags = -O2 -DNDEBUG -g0 + STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=2 else opt_flags = -O2 -DNDEBUG -g1 endif @@ -829,8 +830,8 @@ endif touch $@ # Remove some new flags introduced by dpkg 1.22.0; -STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g" -e "s/-mbranch-protection=standard//g") -STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g" -e "s/-mbranch-protection=standard//g") +STAGE_2_WASM_CFLAGS := $(filter-out -march=% -mfpu=% -fcf-protection% -mbranch-protection%, $(STAGE_2_CFLAGS)) +STAGE_2_WASM_CXXFLAGS := $(filter-out -march=% -mfpu=% -fcf-protection% -mbranch-protection%, $(STAGE_2_CXXFLAGS)) build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%) build-wasm/compiler-rt-%: @@ -968,8 +969,8 @@ sccache-stats: override_dh_auto_build: \ debian-full-build \ debian-libfuzzer-build \ - debian-libclc-build \ - debian-wasm-build \ + $(if $(filter libclc-%, $(shell dh_listpackages)),debian-libclc-build) \ + $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),debian-wasm-build) \ sccache-stats override_dh_prep: build_doc @@ -1131,10 +1132,16 @@ endif # Remove an osx file rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libbolt_rt_instr_osx.a - DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install + if test -d libclc/build; then \ + DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install; \ + fi - DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install - DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install + if test -d build-wasm/compiler-rt-wasm32; then \ + DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install; \ + fi + if test -d build-wasm/compiler-rt-wasm64; then \ + DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install; \ + fi if test -d build-wasm/libcxx-wasm32-wasi; then \ DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/libcxx-wasm32-wasi install; \ fi From f9ecc19b66bd7d2260c97ceedd95b7e4e2d19e92 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Oct 2023 08:57:09 +0200 Subject: [PATCH 046/302] * d/rules: Be less noisy when building without grpc. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 03a1937d..16c0b234 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Consolidate the build flags for the wasm builds. * Disable the clc and wasm builds when not building binary indep packages. * Limit the parallel links to 2 on riscv64. + * d/rules: Be less noisy when building without grpc. -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 diff --git a/debian/rules b/debian/rules index a5540cd9..b84cca5b 100755 --- a/debian/rules +++ b/debian/rules @@ -136,7 +136,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 ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libgrpc++-dev) gt 1.30.0; echo $$?),0) +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) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler) gt 3.12.0; echo $$?),0) From 4de149a8090cf9e8b928fab4253842033c160ae9 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Oct 2023 08:58:40 +0200 Subject: [PATCH 047/302] * Build-depend on libncurses-dev instead of libncurses5-dev. --- 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 16c0b234..92fbc5b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Disable the clc and wasm builds when not building binary indep packages. * Limit the parallel links to 2 on riscv64. * d/rules: Be less noisy when building without grpc. + * Build-depend on libncurses-dev instead of libncurses5-dev. -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 diff --git a/debian/control b/debian/control index fc98ce3f..07cac424 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libelf-dev, libffi-dev, lsb-release, patchutils, diffstat, xz-utils, python3-dev, - libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6), + libedit-dev, libncurses-dev, swig, python3-six, python3-sphinx (>= 1.3.6), binutils-dev, libxml2-dev, libjsoncpp-dev, pkg-config, diff --git a/debian/control.in b/debian/control.in index 9e13f804..80e8987f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libelf-dev, libffi-dev, lsb-release, patchutils, diffstat, xz-utils, python3-dev, - libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6), + libedit-dev, libncurses-dev, swig, python3-six, python3-sphinx (>= 1.3.6), binutils-dev, libxml2-dev, libjsoncpp-dev, pkg-config, From e27b3f677ed936133ba623ea9bd6025267ed05f5 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Oct 2023 11:48:51 +0200 Subject: [PATCH 048/302] * Use a stamps subdirectory for all build stamps. --- debian/changelog | 1 + debian/rules | 45 ++++++++++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 92fbc5b2..c237c8f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Limit the parallel links to 2 on riscv64. * d/rules: Be less noisy when building without grpc. * Build-depend on libncurses-dev instead of libncurses5-dev. + * Use a stamps subdirectory for all build stamps. -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 diff --git a/debian/rules b/debian/rules index b84cca5b..9fd809da 100755 --- a/debian/rules +++ b/debian/rules @@ -532,7 +532,7 @@ ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clan PROJECTS_LIST := $(shell echo "$(PROJECTS)"|sed -e "s| ||g") RUNTIMES_LIST := $(shell echo "$(RUNTIMES)"|sed -e "s| ||g") -preconfigure: +stamps/preconfigure: if ! grep -qs '/proc ' /proc/mounts; then \ echo "/proc needs to be mounted"; \ exit 1; \ @@ -616,13 +616,16 @@ endif dh_listpackages; \ exit 1; \ fi + @mkdir -p stamps + touch $@ # 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: preconfigure +override_dh_auto_configure: stamps/configure +stamps/configure: stamps/preconfigure ifeq (${SCCACHE_ENABLE},yes) ls -al $(SCCACHE_PATH)* endif @@ -762,10 +765,12 @@ endif echo "mismatch of version. Found: $$FOUND_VERSION / Expected: $(LLVM_VERSION_FULL)"; \ exit 1; \ fi + @mkdir -p stamps + touch $@ VERBOSE=-v -debian-full-build: +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 \ @@ -788,7 +793,7 @@ debian-full-build: fi touch $@ -debian-libfuzzer-build: +stamps/debian-libfuzzer-build: ifeq (${LIBFUZZER_ENABLE},yes) cd $(TARGET_BUILD); \ CFLAGS="$(opt_flags) $(STAGE_2_CFLAGS)"; \ @@ -800,7 +805,7 @@ ifeq (${LIBFUZZER_ENABLE},yes) endif touch $@ -debian-libclc-build: +stamps/debian-libclc-build: # workaround missing files on i386 cd $(TARGET_BUILD_STAGE2) && ninja opt llvm-link llvm-as # Builds libclc @@ -950,13 +955,13 @@ endif # Build compiler-rt for wasm32 and wasm64. Build libcxx only for wasm32, as # libcxx requires wasi-libc, which only exists for wasm32 right now. -debian-wasm-build: \ +stamps/debian-wasm-build: \ build-wasm/compiler-rt-wasm32 \ build-wasm/libcxx-wasm32-wasi \ build-wasm/compiler-rt-wasm64 touch $@ -sccache-stats: +stamps/sccache-stats: # If we used sccache, shows stats if test -f $(SCCACHE_CMD); then \ ls -al $(SCCACHE_PATH)/; \ @@ -967,21 +972,21 @@ sccache-stats: touch $@ override_dh_auto_build: \ - debian-full-build \ - debian-libfuzzer-build \ - $(if $(filter libclc-%, $(shell dh_listpackages)),debian-libclc-build) \ - $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),debian-wasm-build) \ - sccache-stats + stamps/debian-full-build \ + stamps/debian-libfuzzer-build \ + $(if $(filter libclc-%, $(shell dh_listpackages)),stamps/debian-libclc-build) \ + $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),stamps/debian-wasm-build) \ + stamps/sccache-stats -override_dh_prep: build_doc +override_dh_prep: stamps/build_doc dh_prep ifeq ($(DOC_GENERATION), no) -build_doc: +stamps/build_doc: mkdir -p $(TARGET_BUILD)/tools/clang/stage2-bins/docs/ocamldoc/html/ @echo "Don't build doc on this distro $(DISTRO)" else -build_doc: +stamps/build_doc: BUILDDIR="_build"; \ ALLSPHINXOPTS="-d $$BUILDDIR/doctrees ."; \ cd $(CURDIR)/llvm/docs && \ @@ -1260,6 +1265,7 @@ 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 $@ @@ -1347,7 +1353,7 @@ 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/ -repack_a_llvm_ir: +stamps/repack_a_llvm_ir: ifeq (${LTO_ENABLE},yes) # with LTO, .a contains llvm ir instead of native code. So, recompile them NJOBS="$(NJOBS)" P_TO_LLVM="$(CURDIR)" VERSION=$(LLVM_VERSION) bash -v debian/llvm-compile-lto-elf.sh $(CXXFLAGS_EXTRA) @@ -1355,7 +1361,7 @@ endif touch $@ -override_dh_installdeb: repack_a_llvm_ir +override_dh_installdeb: stamps/repack_a_llvm_ir # Managed by the package dh_installdeb -a @@ -1458,7 +1464,7 @@ override_dh_auto_test: endif -override_dh_gencontrol: sccache-stats +override_dh_gencontrol: stamps/sccache-stats dh_gencontrol -- $(control_vars) @@ -1490,6 +1496,7 @@ override_dh_auto_clean: : # for some reason, the docs are written to debian/usr and debian/man ... rm -rf debian/usr debian/man : # remove extra stamps - rm -f debian-*-build override_dh_auto_install sccache-stats build_doc + rm -f override_dh_auto_install + rm -rf stamps .PHONY: override_dh_strip preconfigure From 909c92b58137a3d668c4307ff96dd9dd1ee23de7 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 8 Oct 2023 12:15:22 +0200 Subject: [PATCH 049/302] * Factor-out the calls to dh_listpackages. --- debian/changelog | 1 + debian/rules | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index c237c8f7..db403486 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * d/rules: Be less noisy when building without grpc. * Build-depend on libncurses-dev instead of libncurses5-dev. * Use a stamps subdirectory for all build stamps. + * Factor-out the calls to dh_listpackages. -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 diff --git a/debian/rules b/debian/rules index 9fd809da..85092148 100755 --- a/debian/rules +++ b/debian/rules @@ -44,6 +44,10 @@ DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') include /usr/share/dpkg/architecture.mk +# this contains all packages to be built. Note that for at least the clean target, +# this always includes the binary-indep packages. +packages := $(shell dh_listpackages) + CONFIGURE_EXTRA = # dpkg-buildflags support @@ -283,12 +287,12 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) endif endif -ifneq (,$(filter bolt-$(LLVM_VERSION), $(shell dh_listpackages))) +ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) PROJECTS += ;bolt endif # flang is only for 64bits -ifneq (,$(filter flang-$(LLVM_VERSION), $(shell dh_listpackages))) +ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) PROJECTS += ;flang endif @@ -974,8 +978,8 @@ stamps/sccache-stats: override_dh_auto_build: \ stamps/debian-full-build \ stamps/debian-libfuzzer-build \ - $(if $(filter libclc-%, $(shell dh_listpackages)),stamps/debian-libclc-build) \ - $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),stamps/debian-wasm-build) \ + $(if $(filter libclc-%, $(packages)),stamps/debian-libclc-build) \ + $(if $(filter %-wasm32 %-wasm64, $(packages)),stamps/debian-wasm-build) \ stamps/sccache-stats override_dh_prep: stamps/build_doc @@ -1328,7 +1332,7 @@ endif override_dh_install: ifeq (${POLLY_ENABLE},yes) # only for arch:any builds -ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(shell dh_listpackages))) +ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(packages))) dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly # On old Debian & Ubuntu, removing the files is necessary rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake @@ -1339,7 +1343,7 @@ endif dh_install --fail-missing # 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, $(shell dh_listpackages))) +ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(packages))) mkdir -p $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1 if test -f $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h; then \ mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h \ From 55d1899644bfa2cf0d34d2aebc94499070c4bd54 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 9 Oct 2023 04:19:16 +0200 Subject: [PATCH 050/302] * d/rules/preconfigure: Print info about build environment. --- debian/changelog | 1 + debian/rules | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index db403486..738d6b3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Build-depend on libncurses-dev instead of libncurses5-dev. * Use a stamps subdirectory for all build stamps. * Factor-out the calls to dh_listpackages. + * d/rules/preconfigure: Print info about build environment. -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 diff --git a/debian/rules b/debian/rules index 85092148..2a174e2a 100755 --- a/debian/rules +++ b/debian/rules @@ -546,6 +546,14 @@ stamps/preconfigure: echo "llvm spriv isn't detected while it should probably for this distro"; \ fi + @echo "Memory:" + @if [ -e /proc/meminfo ]; then \ + cat /proc/meminfo | grep -E '(Mem|Swap)Free|Cached'; \ + else \ + echo " No memory info available"; \ + fi + @echo "Processors: $$(cat /proc/cpuinfo | grep --count '^processor')" + @echo "DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)" @echo "DEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)" @echo "DEB_HOST_GNU_TYPE=$(DEB_HOST_GNU_TYPE)" From a28d9dcf3d3d340c8557f028c295495d4e84c2f7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 10 Oct 2023 13:15:26 +0200 Subject: [PATCH 051/302] Revert "Ship tblgen-to-irdl as part of mlir-tools" This reverts commit c5efc4b664000d1edf6161dc6ee8ff2b5cee4b23. --- debian/changelog | 7 +++++++ debian/mlir-X.Y-tools.install.in | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 738d6b3c..7e053103 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium +<<<<<<< [ Sylvestre Ledru ] * replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 @@ -16,6 +17,12 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Use a stamps subdirectory for all build stamps. * Factor-out the calls to dh_listpackages. * d/rules/preconfigure: Print info about build environment. +======= + * replace python3-recommonmark by myst-parser + to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 + And disable generation of the doc on old distro + * Also install readtapi => llvm-readtapi symlink +>>>>>>> -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 diff --git a/debian/mlir-X.Y-tools.install.in b/debian/mlir-X.Y-tools.install.in index 497246fa..4fb7ce21 100644 --- a/debian/mlir-X.Y-tools.install.in +++ b/debian/mlir-X.Y-tools.install.in @@ -1,7 +1,5 @@ usr/bin/mlir-* usr/bin/tblgen-lsp-server-@LLVM_VERSION@ -usr/bin/tblgen-to-irdl-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/bin/mlir-* usr/lib/llvm-@LLVM_VERSION@/bin/tblgen-lsp-server -usr/lib/llvm-@LLVM_VERSION@/bin/tblgen-to-irdl From 04b887e29978c5b0bd3a6e8175a45007d982b8f9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 13 Oct 2023 11:47:49 +0200 Subject: [PATCH 052/302] Disable readtapi install --- debian/llvm-X.Y.install.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index 8e11c00f..bf15d2e1 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -81,7 +81,6 @@ 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/readtapi usr/bin/llvm-PerfectShuffle-@LLVM_VERSION@ usr/bin/llvm-addr2line-@LLVM_VERSION@ @@ -145,7 +144,6 @@ usr/bin/llvm-strings-@LLVM_VERSION@ usr/bin/llvm-strip-@LLVM_VERSION@ usr/bin/llvm-symbolizer-@LLVM_VERSION@ usr/bin/llvm-readtapi-@LLVM_VERSION@ -usr/bin/readtapi-@LLVM_VERSION@ usr/bin/llvm-tblgen-@LLVM_VERSION@ usr/bin/llvm-undname-@LLVM_VERSION@ usr/bin/llvm-windres-@LLVM_VERSION@ From 3088d23d31ef656669473734b923ae8e6069234c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 13 Oct 2023 11:48:46 +0200 Subject: [PATCH 053/302] remove conflict --- debian/changelog | 8 -------- 1 file changed, 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e053103..2925ea69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,9 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium -<<<<<<< [ Sylvestre Ledru ] * replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 And disable generation of the doc on old distro - * Also install readtapi => llvm-readtapi symlink * Ship tblgen-to-irdl as part of mlir-tools [ Matthias Klose ] @@ -17,12 +15,6 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Use a stamps subdirectory for all build stamps. * Factor-out the calls to dh_listpackages. * d/rules/preconfigure: Print info about build environment. -======= - * replace python3-recommonmark by myst-parser - to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 - And disable generation of the doc on old distro - * Also install readtapi => llvm-readtapi symlink ->>>>>>> -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 From 7f3e984292f292de4468ec5f0abe12e246fc1380 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 18 Oct 2023 15:17:19 +0200 Subject: [PATCH 054/302] * Limit the number of parallel processes based on the available memory and the packages to be built (flang has some memory hogs). --- debian/changelog | 2 ++ debian/rules | 30 +++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2925ea69..1d70e843 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Use a stamps subdirectory for all build stamps. * Factor-out the calls to dh_listpackages. * d/rules/preconfigure: Print info about build environment. + * Limit the number of parallel processes based on the available memory + and the packages to be built (flang has some memory hogs). -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 diff --git a/debian/rules b/debian/rules index 2a174e2a..fac94841 100755 --- a/debian/rules +++ b/debian/rules @@ -27,27 +27,38 @@ else BRANCH_NAME=$(LLVM_VERSION) endif +VENDOR=$(shell lsb_release -is) +DISTRO=$(shell lsb_release -sc) + SONAME_EXT := 1 SONAME_OPENMP := 5 # Manage the case when the version is 3.5~svn213052-1~exp1 or 3.4.2-1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p") ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) - NJOBS := $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NCPUS := $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) else - NJOBS := $(shell nproc) + NCPUS := $(shell nproc) endif -VENDOR=$(shell lsb_release -is) -DISTRO=$(shell lsb_release -sc) - -DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') - -include /usr/share/dpkg/architecture.mk - # this contains all packages to be built. Note that for at least the clean target, # this always includes the binary-indep packages. 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=3900 +else + MEM_PER_CPU=2100 +endif +NJOBS := $(shell mt=`awk '/^MemTotal/ { print $$2 }' /proc/meminfo`; \ + awk -vn=$(NCPUS) -vmt=$$mt -vm=$(MEM_PER_CPU) \ + 'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2 Date: Fri, 20 Oct 2023 08:29:36 +0200 Subject: [PATCH 055/302] rebase of the patches --- debian/patches/python3-shebang.patch | 472 +++++++++++++-------------- 1 file changed, 231 insertions(+), 241 deletions(-) diff --git a/debian/patches/python3-shebang.patch b/debian/patches/python3-shebang.patch index a57c8f7b..3e4d77f1 100644 --- a/debian/patches/python3-shebang.patch +++ b/debian/patches/python3-shebang.patch @@ -1,779 +1,769 @@ Description: change all shebangs to Python3 find . -name "*.py" -exec sed "s|\!/usr/bin/env python$|\!/usr/bin/env python3|g" -i {} \; -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -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_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-dump.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/bindings/python/examples/cindex/cindex-dump.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/bindings/python/examples/cindex/cindex-dump.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # ===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===# # -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-includes.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/bindings/python/examples/cindex/cindex-includes.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/bindings/python/examples/cindex/cindex-includes.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # ===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===# # -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/share/startfile.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/tools/scan-view/share/startfile.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/tools/scan-view/share/startfile.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """Utility for opening a file using the default application in a cross-platform -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/ABITest/ABITestGen.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/ABITest/ABITestGen.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/ABITest/ABITestGen.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function from pprint import pprint -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CIndex/completion_logger_server.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/CIndex/completion_logger_server.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/CIndex/completion_logger_server.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function import sys from socket import * -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CaptureCmd +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/CaptureCmd =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/CaptureCmd -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CaptureCmd +--- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/CaptureCmd ++++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/CaptureCmd @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """CaptureCmd - A generic tool for capturing information about the invocations of another program. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CmpDriver +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/CmpDriver =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/CmpDriver -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CmpDriver +--- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/CmpDriver ++++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/CmpDriver @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ A simple utility that compares tool invocations and exit codes issued by -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FindSpecRefs +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/FindSpecRefs =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/FindSpecRefs -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FindSpecRefs +--- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/FindSpecRefs ++++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/FindSpecRefs @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import re -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FuzzTest +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/FuzzTest =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/FuzzTest -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FuzzTest +--- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/clang/utils/FuzzTest ++++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/FuzzTest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a generic fuzz testing tool, see --help for more information. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/TestUtils/deep-stack.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/TestUtils/deep-stack.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/TestUtils/deep-stack.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/CmpRuns.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/CmpRuns.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/CmpRuns.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ CmpRuns - A simple tool for comparing two static analyzer runs to determine -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestAdd.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SATestAdd.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SATestAdd.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Static Analyzer qualification infrastructure: adding a new project to -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestBuild.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SATestBuild.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SATestBuild.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Static Analyzer qualification infrastructure. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestUpdateDiffs.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SATestUpdateDiffs.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SATestUpdateDiffs.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Update reference results for static analyzer. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SumTimerInfo.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/SumTimerInfo.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SumTimerInfo.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Script to Summarize statistics in the scan-build output. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/exploded-graph-rewriter.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/analyzer/exploded-graph-rewriter.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/exploded-graph-rewriter.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # ===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--# # -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/check_cfc.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/check_cfc/check_cfc.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/check_cfc/check_cfc.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Check CFC - Check Compile Flow Consistency -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/obj_diff.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/check_cfc/obj_diff.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/check_cfc/obj_diff.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/test_check_cfc.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/check_cfc/test_check_cfc.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/check_cfc/test_check_cfc.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Test internal functions within check_cfc.py.""" -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/modfuzz.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/modfuzz.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/modfuzz.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # To use: # 1) Update the 'decls' list below with your fuzzing configuration. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/token-delta.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/clang/utils/token-delta.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/token-delta.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function import os -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/asan/scripts/asan_symbolize.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/compiler-rt/lib/asan/scripts/asan_symbolize.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # ===- lib/asan/scripts/asan_symbolize.py -----------------------------------===# # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # ===- lib/fuzzer/scripts/unbalanced_allocs.py ------------------------------===# # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # ===- lib/sanitizer_common/scripts/gen_dynamic_list.py ---------------------===# # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/sancov.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/compiler-rt/lib/sanitizer_common/scripts/sancov.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Merge or print the coverage data collected by asan's coverage. # Input files are sequences of 4-byte integers. # We need to merge these integers into a set and then -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/cat_files.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/libcxx/utils/cat_files.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/libcxx/utils/cat_files.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/generate_feature_test_macro_components.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/libcxx/utils/generate_feature_test_macro_components.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/libcxx/utils/generate_feature_test_macro_components.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os from builtins import range -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lld/utils/benchmark.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lld/utils/benchmark.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lld/utils/benchmark.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/examples/python/file_extract.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/examples/python/file_extract.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/examples/python/file_extract.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import string import struct -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/bench.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/packages/Python/lldbsuite/test/bench.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/packages/Python/lldbsuite/test/bench.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ A simple bench runner which delegates to the ./dotest.py test driver to run the -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/scripts/analyze-project-deps.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import binascii - import json -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/analyze-project-deps.py -=================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/scripts/analyze-project-deps.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import itertools -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/verify_api.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/scripts/verify_api.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/scripts/verify_api.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import subprocess import optparse -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 '''This module implements a Finite State Machine (FSM). In addition to state this FSM also maintains a user defined "memory". So this FSM can be used as a -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/lui.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/utils/lui/lui.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/utils/lui/lui.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ##===-- lui.py -----------------------------------------------*- Python -*-===## ## # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/sandbox.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/lldb/utils/lui/sandbox.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/utils/lui/sandbox.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ##===-- sandbox.py -------------------------------------------*- Python -*-===## ## # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/BugPoint/compile-custom.ll.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/test/BugPoint/compile-custom.ll.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/test/BugPoint/compile-custom.ll.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/Other/opt-bisect-helper.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/test/Other/opt-bisect-helper.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/test/Other/opt-bisect-helper.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/TableGen/JSON-check.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/test/TableGen/JSON-check.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/test/TableGen/JSON-check.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import subprocess -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-diff.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/opt-diff.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/opt-diff.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-stats.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/opt-stats.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/opt-stats.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-viewer.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/opt-viewer.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/opt-viewer.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/optrecord.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/tools/opt-viewer/optrecord.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/optrecord.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/Misc/zkill +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/Misc/zkill =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/Misc/zkill -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import re -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/abtest.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/abtest.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/abtest.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Given a previous good compile narrow down miscompiles. # Expects two directories named "before" and "after" each containing a set of -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/bisect =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/bisect -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect +--- llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560.orig/llvm/utils/bisect ++++ llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/bisect @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # The way you use this is you create a script that takes in as its first # argument a count. The script passes into LLVM the count via a command -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect-skip-count +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/bisect-skip-count =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/bisect-skip-count -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect-skip-count +--- 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_17~++20230723074821+3ebe606592fb/llvm/utils/bugpoint_gisel_reducer.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/bugpoint_gisel_reducer.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/bugpoint_gisel_reducer.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Reduces GlobalISel failures. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/clang-parse-diagnostics-file +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/clang-parse-diagnostics-file =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/clang-parse-diagnostics-file -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import plistlib -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/create_ladder_graph.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/create_ladder_graph.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/create_ladder_graph.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A ladder graph creation program. This is a python program that creates c source code that will generate -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_symbols.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/extract_symbols.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/extract_symbols.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A tool for extracting a list of symbols to export -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_vplan.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/extract_vplan.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/extract_vplan.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This script extracts the VPlan digraphs from the vectoriser debug messages # and saves them in individual dot files (one for each plan). Optionally, and -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/indirect_calls.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/indirect_calls.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/indirect_calls.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A tool for looking for indirect jumps and calls in x86 binaries. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/lit/ProgressBar.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/lit/ProgressBar.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/lit/ProgressBar.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Source: http://code.activestate.com/recipes/475116/, with # modifications by Daniel Dunbar. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import platform -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/llvm-gisel-cov.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/llvm-gisel-cov.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/llvm-gisel-cov.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Summarize the information in the given coverage files. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/prepare-code-coverage-artifact.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/prepare-code-coverage-artifact.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/prepare-code-coverage-artifact.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-nightly.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/release/findRegressions-nightly.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/release/findRegressions-nightly.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import re, string, sys, os, time -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-simple.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/release/findRegressions-simple.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/release/findRegressions-simple.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import re, string, sys, os, time, math -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_fuzz.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/shuffle_fuzz.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/shuffle_fuzz.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A shuffle vector fuzz tester. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_select_fuzz_tester.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/shuffle_select_fuzz_tester.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/shuffle_select_fuzz_tester.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A shuffle-select vector fuzz tester. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/sort_includes.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/sort_includes.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/sort_includes.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Script to sort the top-most block of #include lines. -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/unicode-case-fold.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/unicode-case-fold.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/unicode-case-fold.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Unicode case folding database conversion utility -Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/wciia.py +Index: llvm-toolchain-snapshot_18~++20231020082810+f24d9490e560/llvm/utils/wciia.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/wciia.py -+++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/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 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 From b2ae4411725be6f61f3e418eb85ccc3268c7133a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 20 Oct 2023 15:38:07 +0200 Subject: [PATCH 056/302] Rename lldb-vscode => lldb-dap --- debian/changelog | 9 +++++++++ debian/lldb-X.Y.install.in | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1d70e843..fe731c87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium +<<<<<<< [ Sylvestre Ledru ] * replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 @@ -17,6 +18,14 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * d/rules/preconfigure: Print info about build environment. * Limit the number of parallel processes based on the available memory and the packages to be built (flang has some memory hogs). +======= + * replace python3-recommonmark by myst-parser + to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 + And disable generation of the doc on old distro + * Also install readtapi => llvm-readtapi symlink + * Ship tblgen-to-irdl as part of mlir-tools + * Rename lldb-vscode => lldb-dap +>>>>>>> -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in index 118022f5..2a8b415e 100644 --- a/debian/lldb-X.Y.install.in +++ b/debian/lldb-X.Y.install.in @@ -5,5 +5,5 @@ usr/lib/llvm-@LLVM_VERSION@/bin/lldb-argdumper usr/bin/lldb-@LLVM_VERSION@* usr/bin/lldb-server-@LLVM_VERSION@* usr/bin/lldb-argdumper-@LLVM_VERSION@ -usr/bin/lldb-vscode-@LLVM_VERSION@ +usr/bin/lldb-dap-@LLVM_VERSION@ usr/bin/lldb-instr-@LLVM_VERSION@ From 3409cebd4fa9171e14032e67e487ec7df049338e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 24 Oct 2023 12:23:13 +0200 Subject: [PATCH 057/302] Fix changelog merge --- debian/changelog | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe731c87..90deb440 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium -<<<<<<< [ Sylvestre Ledru ] * replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 And disable generation of the doc on old distro * Ship tblgen-to-irdl as part of mlir-tools + * Rename lldb-vscode => lldb-dap [ Matthias Klose ] * Consolidate the build flags for the wasm builds. @@ -18,14 +18,6 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * d/rules/preconfigure: Print info about build environment. * Limit the number of parallel processes based on the available memory and the packages to be built (flang has some memory hogs). -======= - * replace python3-recommonmark by myst-parser - to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 - And disable generation of the doc on old distro - * Also install readtapi => llvm-readtapi symlink - * Ship tblgen-to-irdl as part of mlir-tools - * Rename lldb-vscode => lldb-dap ->>>>>>> -- Matthias Klose Sun, 08 Oct 2023 08:10:51 +0200 From e717afad8125488205e325a5ff5a348ac195f314 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 25 Oct 2023 09:23:34 +0200 Subject: [PATCH 058/302] Fixup changelog --- debian/changelog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a90bcad0..270cf5fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,12 +56,6 @@ llvm-toolchain-snapshot (1:18~++20230725115106+b6847edfc235-1~exp1) experimental * snapshot is now 18 -- Sylvestre Ledru Tue, 25 Jul 2023 23:52:42 +0200 -======= - - [ Sylvestre Ledru ] - * New upstream release - - -- Sylvestre Ledru Tue, 17 Oct 2023 08:44:01 +0200 llvm-toolchain-17 (1:17.0.2-1~exp1) experimental; urgency=medium From 9bae99b53946666c9f7a5be972366f4accdf8387 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 27 Oct 2023 19:22:06 +0200 Subject: [PATCH 059/302] Ship tblgen-to-irdl as part of mlir-tools --- debian/changelog | 1 + debian/mlir-X.Y-tools.install.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 270cf5fc..d30ccd02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; And disable generation of the doc on old distro * Ship tblgen-to-irdl as part of mlir-tools * Rename lldb-vscode => lldb-dap + * Ship tblgen-to-irdl as part of mlir-tools llvm-toolchain-17 (1:17.0.3-1~exp2) UNRELEASED; urgency=medium diff --git a/debian/mlir-X.Y-tools.install.in b/debian/mlir-X.Y-tools.install.in index 4fb7ce21..497246fa 100644 --- a/debian/mlir-X.Y-tools.install.in +++ b/debian/mlir-X.Y-tools.install.in @@ -1,5 +1,7 @@ usr/bin/mlir-* usr/bin/tblgen-lsp-server-@LLVM_VERSION@ +usr/bin/tblgen-to-irdl-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/bin/mlir-* usr/lib/llvm-@LLVM_VERSION@/bin/tblgen-lsp-server +usr/lib/llvm-@LLVM_VERSION@/bin/tblgen-to-irdl From bc63e7cd3a842ba569cc09131f5c0cd3c89712e5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 1 Nov 2023 09:10:33 +0100 Subject: [PATCH 060/302] rebase of the patch --- debian/patches/clang-tidy-run-bin.diff | 10 +++++----- debian/patches/force-sse2-compiler-rt.diff | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff index 6d56590b..4f61f44f 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -1,9 +1,9 @@ -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -@@ -256,10 +256,13 @@ def main(): - help="allow alpha checkers from " "clang-analyzer.", +--- 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 +@@ -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" diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index 53968f12..7fb5c8f2 100644 --- a/debian/patches/force-sse2-compiler-rt.diff +++ b/debian/patches/force-sse2-compiler-rt.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9/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 -@@ -765,6 +765,12 @@ else () +--- llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9/compiler-rt/lib/builtins/CMakeLists.txt +@@ -764,6 +764,12 @@ else () append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() @@ -14,4 +14,4 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/ + append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS) - # These flags would normally be added to CMAKE_C_FLAGS by the llvm + # Don't embed directives for picking any specific CRT From e4de0d4cf2ba86b25737763c40de67fc3cc41c28 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 1 Nov 2023 21:58:17 +0100 Subject: [PATCH 061/302] fix changelog --- debian/changelog | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ef35927..37ba2ba5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,6 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Rename lldb-vscode => lldb-dap * Ship tblgen-to-irdl as part of mlir-tools -llvm-toolchain-17 (1:17.0.4-1) unstable; urgency=medium - [ Matthias Klose ] * Limit the number of parallel processes based on the available memory and the packages to be built (flang has some memory hogs). From 3ac7eba5ba88f4a94ed73f3c846461843f08d04f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 1 Nov 2023 21:58:32 +0100 Subject: [PATCH 062/302] remove patch applied upstream --- debian/patches/series | 1 - debian/patches/ubuntu-releases.patch | 38 ---------------------------- 2 files changed, 39 deletions(-) delete mode 100644 debian/patches/ubuntu-releases.patch diff --git a/debian/patches/series b/debian/patches/series index 0b23267d..a58f5b2a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -145,4 +145,3 @@ unwind-force-pthread-dl.diff force-sse2-compiler-rt.diff bolt-disable-emit-relocs.patch link-grpc.diff -ubuntu-releases.patch diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch deleted file mode 100644 index a2d7fbe2..00000000 --- a/debian/patches/ubuntu-releases.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: Update the list of Ubuntu release names -Forwarded: no -Author: Graham Inggs -Last-Update: 2023-04-29 - -Index: llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h -=================================================================== ---- llvm-toolchain-17-17.0.3.orig/clang/include/clang/Driver/Distro.h -+++ llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h -@@ -78,6 +78,7 @@ - UbuntuKinetic, - UbuntuLunar, - UbuntuMantic, -+ UbuntuNoble, - UnknownDistro - }; - -@@ -129,7 +130,7 @@ - } - - bool IsUbuntu() const { -- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic; -+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble; - } - - bool IsAlpineLinux() const { return DistroVal == AlpineLinux; } -Index: llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp -=================================================================== ---- llvm-toolchain-17-17.0.3.orig/clang/lib/Driver/Distro.cpp -+++ llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp -@@ -94,6 +94,7 @@ - .Case("kinetic", Distro::UbuntuKinetic) - .Case("lunar", Distro::UbuntuLunar) - .Case("mantic", Distro::UbuntuMantic) -+ .Case("noble", Distro::UbuntuNoble) - .Default(Distro::UnknownDistro); - return Version; - } From 9e0f02474c6c6841028b1e6fa06a6bc3d37370e2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 2 Nov 2023 11:06:47 +0100 Subject: [PATCH 063/302] rebase of the patch --- .../libcxx/libcxx-silent-failure-arm64.diff | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff index 5a596877..8095c353 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_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +Index: llvm-toolchain-snapshot_18~++20231102103655+18839aec4ed1/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp -+++ llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/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 @@ -8,6 +8,7 @@ // // UNSUPPORTED: no-threads @@ -10,16 +10,16 @@ Index: llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/ // -Index: llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +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 =================================================================== ---- llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -+++ llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -@@ -10,7 +10,7 @@ +--- 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 @@ // UNSUPPORTED: c++03, c++11 // ALLOW_RETRIES: 2 --// XFAIL: availability-shared_mutex-missing +// XFAIL: * - ++ // + // template class shared_lock; From 57cfe6e6634a5dc83f45a09aca44d7af51c83847 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 11 Nov 2023 10:45:07 +0100 Subject: [PATCH 064/302] * Also install liborc_rt*.a on ppc64 and ppc64el. --- 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 37ba2ba5..5fa1d8a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; [ Matthias Klose ] * Limit the number of parallel processes based on the available memory and the packages to be built (flang has some memory hogs). + * Also install liborc_rt*.a on ppc64 and ppc64el. [ Sylvestre Ledru ] * New supstream release diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index 6864ec82..cd2a8425 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] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* +[amd64 arm64 armhf armel i386 ppc64 ppc64el] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* From ff70904ea89a1ab2b156b685b66a426a47459b84 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 14 Nov 2023 10:02:53 +0100 Subject: [PATCH 065/302] rebase of the patch --- debian/patches/force-sse2-compiler-rt.diff | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index 7fb5c8f2..13a5e3f4 100644 --- a/debian/patches/force-sse2-compiler-rt.diff +++ b/debian/patches/force-sse2-compiler-rt.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20231114093943+6229cd0272a8/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9/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 () append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() @@ -13,5 +13,5 @@ Index: llvm-toolchain-snapshot_18~++20231101090856+e144ae54dcb9/compiler-rt/lib/ + endif() + append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS) + append_list_if(COMPILER_RT_HAS_WBUILTIN_DECLARATION_MISMATCH_FLAG -Werror=builtin-declaration-mismatch BUILTIN_CFLAGS) - # Don't embed directives for picking any specific CRT From 595804bfd54ff812ac582a98e360b4b7334291d3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 Nov 2023 00:09:45 +0100 Subject: [PATCH 066/302] relax to the dep llvm-spirv-17 --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 682f9796..30d3ecca 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], + llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello, spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], libcurl4-openssl-dev | libcurl-dev, diff --git a/debian/control.in b/debian/control.in index 7242e09b..30cbdd9d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], + llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello, spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], libcurl4-openssl-dev | libcurl-dev, From 1d8b2e734daf09e2de2f50dbe7a3b67ad2c7a008 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Nov 2023 22:50:24 +0100 Subject: [PATCH 067/302] rebase of the patches --- debian/patches/libcxx/libcxx-armhf-ftbfs.diff | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff index 46d63e30..8d2e078e 100644 --- a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff +++ b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff @@ -1,15 +1,19 @@ -Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h +Index: llvm-toolchain-snapshot_18~++20231122103518+575c9bf940e5/libcxx/include/__atomic/aliases.h =================================================================== ---- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxx/include/__atomic/aliases.h -+++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h -@@ -107,9 +107,12 @@ using __libcpp_unsigned_lock_free = __co - #endif +--- 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; + # endif - #if !defined(_LIBCPP_NO_LOCK_FREE_TYPES) + # ifndef _LIBCPP_NO_LOCK_FREE_TYPES +#ifndef NO_LOCK_FREE - using atomic_signed_lock_free = atomic<__libcpp_signed_lock_free>; - using atomic_unsigned_lock_free = atomic<__libcpp_unsigned_lock_free>; - #endif + 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 + using atomic_unsigned_lock_free = atomic>; + # endif // !_LIBCPP_NO_LOCK_FREE_TYPES + #endif // C++20 +#endif +#undef NO_LOCK_FREE From beec0c2024b7f4b19bb66b8bdb76cf7124962551 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 23 Nov 2023 09:44:36 +0100 Subject: [PATCH 068/302] * Fix stripping build flags on Ubuntu/ppc64el. --- debian/changelog | 1 + debian/rules | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1e8ad59..004d6044 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Limit the number of parallel processes based on the available memory and the packages to be built (flang has some memory hogs). * Also install liborc_rt*.a on ppc64 and ppc64el. + * Fix stripping build flags on Ubuntu/ppc64el. [ Sylvestre Ledru ] * New supstream release diff --git a/debian/rules b/debian/rules index d976fb55..82b82f39 100755 --- a/debian/rules +++ b/debian/rules @@ -65,9 +65,13 @@ CONFIGURE_EXTRA = # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto # these are handled on a per stage / build basis -export DEB_CFLAGS_MAINT_STRIP = -g -O2 -export DEB_CXXFLAGS_MAINT_STRIP = -g -O2 - +ifeq ($(VENDOR)-$(DEB_HOST_ARCH),Ubuntu-ppc64el) + export DEB_CFLAGS_MAINT_STRIP = -g -O3 + export DEB_CXXFLAGS_MAINT_STRIP = -g -O3 +else + export DEB_CFLAGS_MAINT_STRIP = -g -O2 + export DEB_CXXFLAGS_MAINT_STRIP = -g -O2 +endif include /usr/share/dpkg/buildflags.mk # We use a stage2 build. It means that a first clang is built using gcc, From 4763fb888ce99961a5a74bf98b8bb4f2d86eb04d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 23 Nov 2023 10:57:54 +0100 Subject: [PATCH 069/302] rebase of the patches --- debian/patches/0044-soname.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index c678f7b0..5822986b 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_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt +--- llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/clang/tools/libclang/CMakeLists.txt @@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt +--- llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/llvm/tools/llvm-shlib/CMakeLists.txt @@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB) endif() add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) @@ -27,5 +27,5 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm- + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + list(REMOVE_DUPLICATES LIB_NAMES) - if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") + if((MINGW) OR (HAIKU) + OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") From 73955b611df5b3f4514ae4ec5bce311239031c72 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 24 Nov 2023 17:49:02 +0100 Subject: [PATCH 070/302] * libclang1-18: Only encode the major version in the soname. Closes: #1056126. --- debian/changelog | 1 + debian/libclang-X.Y-dev.links.in | 6 +++--- debian/libclang1-X.Y.links.in | 6 +++--- debian/libclang1-X.Y.symbols.in | 2 +- debian/patches/libclang-major-version-only.diff | 11 +++++++++++ debian/patches/series | 1 + debian/rules | 4 ++++ 7 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 debian/patches/libclang-major-version-only.diff diff --git a/debian/changelog b/debian/changelog index 004d6044..fb152685 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; and the packages to be built (flang has some memory hogs). * Also install liborc_rt*.a on ppc64 and ppc64el. * Fix stripping build flags on Ubuntu/ppc64el. + * libclang1-18: Only encode the major version in the soname. Closes: #1056126. [ Sylvestre Ledru ] * New supstream release diff --git a/debian/libclang-X.Y-dev.links.in b/debian/libclang-X.Y-dev.links.in index a82e6089..7cd10c4d 100644 --- a/debian/libclang-X.Y-dev.links.in +++ b/debian/libclang-X.Y-dev.links.in @@ -1,3 +1,3 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in index dc4b7a44..f735225c 100644 --- a/debian/libclang1-X.Y.links.in +++ b/debian/libclang1-X.Y.links.in @@ -1,4 +1,4 @@ # as upstream -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 +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 diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in index 49724304..2f07205d 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Y.symbols.in @@ -1,4 +1,4 @@ -libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER# +libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER# (optional)LLVM_13@LLVM_13 1:15.0.7-3 (optional)LLVM_16@LLVM_16 1:16.0.2-1 (optional)LLVM_17@LLVM_17 1:17.0.1-1 diff --git a/debian/patches/libclang-major-version-only.diff b/debian/patches/libclang-major-version-only.diff new file mode 100644 index 00000000..36800f38 --- /dev/null +++ b/debian/patches/libclang-major-version-only.diff @@ -0,0 +1,11 @@ +--- a/clang/tools/libclang/CMakeLists.txt ++++ b/clang/tools/libclang/CMakeLists.txt +@@ -196,7 +196,7 @@ + OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libclang.map) + + set_target_properties(libclang PROPERTIES +- VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX} ++ VERSION ${LLVM_VERSION_MAJOR} + ${LIBCLANG_SOVERSION_ARG}) + endif() + endif() diff --git a/debian/patches/series b/debian/patches/series index a58f5b2a..fa5d6eab 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -145,3 +145,4 @@ unwind-force-pthread-dl.diff force-sse2-compiler-rt.diff bolt-disable-emit-relocs.patch link-grpc.diff +libclang-major-version-only.diff diff --git a/debian/rules b/debian/rules index 82b82f39..c6b5c954 100755 --- a/debian/rules +++ b/debian/rules @@ -13,12 +13,14 @@ 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)) +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_SNAPSHOT := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:(.*),\1,p") ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL)) LLVM_VERSION_FULL := $(LLVM_VERSION).0.0 endif +LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$NF+=1; print}') SOURCE_NAME := $(shell dpkg-parsechangelog -S Source) ifneq (,$(findstring snapshot,$(SOURCE_NAME))) @@ -612,7 +614,9 @@ stamps/preconfigure: sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ + -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ -e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \ + -e "s|@LLVM_VERSION_NEXT@|$(LLVM_VERSION_NEXT)|g" \ -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \ done From 0f0b0527b1b1cd549734fc0acdb1b4301aee585e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 24 Nov 2023 17:52:47 +0100 Subject: [PATCH 071/302] correct changelog entry --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fb152685..33d18225 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; and the packages to be built (flang has some memory hogs). * Also install liborc_rt*.a on ppc64 and ppc64el. * Fix stripping build flags on Ubuntu/ppc64el. - * libclang1-18: Only encode the major version in the soname. Closes: #1056126. + * libclang1-18: Only encode the major version in the soname. See #1056126. [ Sylvestre Ledru ] * New supstream release From a8dd526d5dc1433191e86a3c9210b84d3dfaae28 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 25 Nov 2023 11:23:40 +0100 Subject: [PATCH 072/302] Don't install *clang_rt* on sparc and sparc64 --- debian/changelog | 3 +++ debian/libclang-rt-X.Y-dev.install.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 33d18225..ae7d7b24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * New supstream release * Upload to unstable + [ John Paul Adrian Glaubitz ] + * Don't install *clang_rt* on sparc and sparc64 + -- Sylvestre Ledru Tue, 31 Oct 2023 11:39:22 +0100 llvm-toolchain-17 (1:17.0.3-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 cd2a8425..8b973ead 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/ -usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt* +[!sparc !sparc64] 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 1b14b139f084a331e5a41d39a382ef9739f591b5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 28 Nov 2023 10:18:06 +0100 Subject: [PATCH 073/302] Remove __tgt_rtl_deinit_plugin & __tgt_rtl_deinit_device symbols from openmp https://github.com/llvm/llvm-project/pull/73557 --- debian/changelog | 6 ++---- debian/libomp5-X.Y.symbols.in | 6 ------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae7d7b24..caf73b06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Ship tblgen-to-irdl as part of mlir-tools * Rename lldb-vscode => lldb-dap * Ship tblgen-to-irdl as part of mlir-tools + * Remove __tgt_rtl_deinit_plugin & __tgt_rtl_deinit_device symbols from + openmp https://github.com/llvm/llvm-project/pull/73557 [ Matthias Klose ] * Limit the number of parallel processes based on the available memory @@ -15,10 +17,6 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Fix stripping build flags on Ubuntu/ppc64el. * libclang1-18: Only encode the major version in the soname. See #1056126. - [ Sylvestre Ledru ] - * New supstream release - * Upload to unstable - [ John Paul Adrian Glaubitz ] * Don't install *clang_rt* on sparc and sparc64 diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in index ce0fe517..2c788edd 100644 --- a/debian/libomp5-X.Y.symbols.in +++ b/debian/libomp5-X.Y.symbols.in @@ -1360,8 +1360,6 @@ libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_data_submit@VERS1.0 17 __tgt_rtl_data_submit_async@VERS1.0 17 __tgt_rtl_data_unlock@VERS1.0 17 - __tgt_rtl_deinit_device@VERS1.0 17 - __tgt_rtl_deinit_plugin@VERS1.0 17 __tgt_rtl_destroy_event@VERS1.0 17 __tgt_rtl_init_async_info@VERS1.0 17 __tgt_rtl_init_device@VERS1.0 17 @@ -1397,8 +1395,6 @@ libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_data_submit@VERS1.0 17 __tgt_rtl_data_submit_async@VERS1.0 17 __tgt_rtl_data_unlock@VERS1.0 17 - __tgt_rtl_deinit_device@VERS1.0 17 - __tgt_rtl_deinit_plugin@VERS1.0 17 __tgt_rtl_destroy_event@VERS1.0 17 __tgt_rtl_init_async_info@VERS1.0 17 __tgt_rtl_init_device@VERS1.0 17 @@ -1434,8 +1430,6 @@ libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_data_submit@VERS1.0 17 __tgt_rtl_data_submit_async@VERS1.0 17 __tgt_rtl_data_unlock@VERS1.0 17 - __tgt_rtl_deinit_device@VERS1.0 17 - __tgt_rtl_deinit_plugin@VERS1.0 17 __tgt_rtl_destroy_event@VERS1.0 17 __tgt_rtl_init_async_info@VERS1.0 17 __tgt_rtl_init_device@VERS1.0 17 From 89439def8c0a40f613ea73d025df7874550daf93 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 29 Nov 2023 14:46:38 +0100 Subject: [PATCH 074/302] llvmspirv remove the i386 restriction --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 068a03bf..b91022fb 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], + llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello, spirv-tools [linux-any] | hello [!i386], wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev, diff --git a/debian/control.in b/debian/control.in index aca57233..036fa54c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], + llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello, spirv-tools [linux-any] | hello [!i386], wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev, From 6297fd36b255645886cdc16ab284c06ddc6684b8 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 29 Nov 2023 19:02:26 +0100 Subject: [PATCH 075/302] * Restore the patch for D148945, searching /usr/lib/llvm-18/lib by default. Addresses: #1056580. --- debian/changelog | 2 ++ debian/patches/D148945-revert.diff | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 24 insertions(+) create mode 100644 debian/patches/D148945-revert.diff diff --git a/debian/changelog b/debian/changelog index caf73b06..8c6077bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Also install liborc_rt*.a on ppc64 and ppc64el. * Fix stripping build flags on Ubuntu/ppc64el. * libclang1-18: Only encode the major version in the soname. See #1056126. + * Restore the patch for D148945, searching /usr/lib/llvm-18/lib by default. + Addresses: #1056580. [ John Paul Adrian Glaubitz ] * Don't install *clang_rt* on sparc and sparc64 diff --git a/debian/patches/D148945-revert.diff b/debian/patches/D148945-revert.diff new file mode 100644 index 00000000..73426bdb --- /dev/null +++ b/debian/patches/D148945-revert.diff @@ -0,0 +1,21 @@ +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 + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + ++ // 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) && ++ D.getVFS().exists(D.Dir + "/../lib/libc++.so")) ++ addPathIfExists(D, D.Dir + "/../lib", Paths); ++ + addPathIfExists(D, concat(SysRoot, "/lib"), Paths); + addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); + } diff --git a/debian/patches/series b/debian/patches/series index fa5d6eab..9fbab5b3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -146,3 +146,4 @@ force-sse2-compiler-rt.diff bolt-disable-emit-relocs.patch link-grpc.diff libclang-major-version-only.diff +D148945-revert.diff From 34ed134da18e70738fb9138ea435473b82b24b4d Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 1 Dec 2023 19:13:33 +0100 Subject: [PATCH 076/302] * Also use the free swap to determine the number of parallel processes. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8c6077bf..49c01646 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * libclang1-18: Only encode the major version in the soname. See #1056126. * Restore the patch for D148945, searching /usr/lib/llvm-18/lib by default. Addresses: #1056580. + * Also use the free swap to determine the number of parallel processes. [ John Paul Adrian Glaubitz ] * Don't install *clang_rt* on sparc and sparc64 diff --git a/debian/rules b/debian/rules index c6b5c954..4e685647 100755 --- a/debian/rules +++ b/debian/rules @@ -53,7 +53,7 @@ ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) else MEM_PER_CPU=2100 endif -NJOBS := $(shell mt=`awk '/^MemTotal/ { print $$2 }' /proc/meminfo`; \ +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, 2 Dec 2023 23:27:56 +0100 Subject: [PATCH 077/302] * Set the cpu defaults for the ARM32 architectures: - armel: arm9e. Closes: #1056115. - armhf: cortex-a7. --- debian/changelog | 3 +++ debian/patches/arm32-defaults.diff | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+) create mode 100644 debian/patches/arm32-defaults.diff diff --git a/debian/changelog b/debian/changelog index 49c01646..2a475764 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; * Restore the patch for D148945, searching /usr/lib/llvm-18/lib by default. Addresses: #1056580. * Also use the free swap to determine the number of parallel processes. + * Set the cpu defaults for the ARM32 architectures: + - armel: arm9e. Closes: #1056115. + - armhf: cortex-a7. [ John Paul Adrian Glaubitz ] * Don't install *clang_rt* on sparc and sparc64 diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff new file mode 100644 index 00000000..7266cc8f --- /dev/null +++ b/debian/patches/arm32-defaults.diff @@ -0,0 +1,18 @@ +--- a/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ b/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -603,6 +603,15 @@ StringRef ARM::getARMCPUForArch(const ll + if (MArch == "v7k") + return "cortex-a7"; + break; ++ case llvm::Triple::Linux: ++ switch (Triple.getEnvironment()) { ++ case llvm::Triple::GNUEABI: ++ return "arm9e"; // armv5te ++ case llvm::Triple::GNUEABIHF: ++ return "cortex-a7"; // armv7-a ++ default: ++ return "armv5"; ++ } + default: + break; + } diff --git a/debian/patches/series b/debian/patches/series index 9fbab5b3..dcad68f3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -147,3 +147,4 @@ bolt-disable-emit-relocs.patch link-grpc.diff libclang-major-version-only.diff D148945-revert.diff +arm32-defaults.diff From f30121f5a72a20949e1a37c99708c3b5e163802c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 28 Nov 2023 10:19:00 +0100 Subject: [PATCH 078/302] prepare upload --- debian/changelog | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2a475764..7c2535bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) experimental; urgency=medium +<<<<<<< [ Sylvestre Ledru ] * replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 @@ -25,6 +26,27 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; [ John Paul Adrian Glaubitz ] * Don't install *clang_rt* on sparc and sparc64 +======= + [ Sylvestre Ledru ] + * replace python3-recommonmark by myst-parser + to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 + And disable generation of the doc on old distro + * Ship tblgen-to-irdl as part of mlir-tools + * Rename lldb-vscode => lldb-dap + * Ship tblgen-to-irdl as part of mlir-tools + * Remove __tgt_rtl_deinit_plugin & __tgt_rtl_deinit_device symbols from + openmp https://github.com/llvm/llvm-project/pull/73557 + + [ Matthias Klose ] + * Limit the number of parallel processes based on the available memory + and the packages to be built (flang has some memory hogs). + * Also install liborc_rt*.a on ppc64 and ppc64el. + * Fix stripping build flags on Ubuntu/ppc64el. + * libclang1-18: Only encode the major version in the soname. See #1056126. + + [ John Paul Adrian Glaubitz ] + * Don't install *clang_rt* on sparc and sparc64 +>>>>>>> -- Sylvestre Ledru Tue, 31 Oct 2023 11:39:22 +0100 From c9f95b639fd79c53c57441fdd90ef402e0f8736c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Dec 2023 10:22:33 +0100 Subject: [PATCH 079/302] fix changelog --- debian/changelog | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c2535bc..368e1706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp1) experimental; urgency=medium -<<<<<<< [ Sylvestre Ledru ] * replace python3-recommonmark by myst-parser to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 @@ -26,29 +25,8 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) experimental [ John Paul Adrian Glaubitz ] * Don't install *clang_rt* on sparc and sparc64 -======= - [ Sylvestre Ledru ] - * replace python3-recommonmark by myst-parser - to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 - And disable generation of the doc on old distro - * Ship tblgen-to-irdl as part of mlir-tools - * Rename lldb-vscode => lldb-dap - * Ship tblgen-to-irdl as part of mlir-tools - * Remove __tgt_rtl_deinit_plugin & __tgt_rtl_deinit_device symbols from - openmp https://github.com/llvm/llvm-project/pull/73557 - [ Matthias Klose ] - * Limit the number of parallel processes based on the available memory - and the packages to be built (flang has some memory hogs). - * Also install liborc_rt*.a on ppc64 and ppc64el. - * Fix stripping build flags on Ubuntu/ppc64el. - * libclang1-18: Only encode the major version in the soname. See #1056126. - - [ John Paul Adrian Glaubitz ] - * Don't install *clang_rt* on sparc and sparc64 ->>>>>>> - - -- Sylvestre Ledru Tue, 31 Oct 2023 11:39:22 +0100 + -- Sylvestre Ledru Sun, 03 Dec 2023 10:21:45 +0100 llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium @@ -70,6 +48,13 @@ llvm-toolchain-snapshot (1:18~++20230910052457+7560356a832f-1~exp1) experimental -- 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 35cc1319c6f9ad2bf91d5296feb187c8ac2bd027 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Dec 2023 07:44:06 +0100 Subject: [PATCH 080/302] * revert debian/patches/arm32-defaults.diff for causing https://lore.kernel.org/lkml/20231204225148.GA2094126@dev-arch.thelio-3990X/T/ --- debian/changelog | 19 +++++++++++++++++++ debian/patches/arm32-defaults.diff | 18 ------------------ debian/patches/series | 1 - 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 debian/patches/arm32-defaults.diff diff --git a/debian/changelog b/debian/changelog index 368e1706..bea680b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp2) UNRELEASED; urgency=medium + + * revert debian/patches/arm32-defaults.diff for causing + https://lore.kernel.org/lkml/20231204225148.GA2094126@dev-arch.thelio-3990X/T/ + + -- Sylvestre Ledru Tue, 05 Dec 2023 07:43:43 +0100 + llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] @@ -77,6 +84,18 @@ llvm-toolchain-snapshot (1:18~++20230725115106+b6847edfc235-1~exp1) experimental -- Sylvestre Ledru Tue, 25 Jul 2023 23:52:42 +0200 +llvm-toolchain-17 (1:17.0.6-2) UNRELEASED; urgency=medium + + [ Gianfranco Costamagna ] + * Add new cmake-clang-test to spot issues such as + Debian bug #1057151 + * Fix cmake file (Closes: #1057151) + + [ Matthias Klose ] + * Also use the free swap to determine the number of parallel processes. + + -- Gianfranco Costamagna Fri, 01 Dec 2023 10:50:00 +0100 + llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium [ Matthias Klose ] diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff deleted file mode 100644 index 7266cc8f..00000000 --- a/debian/patches/arm32-defaults.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- a/llvm/lib/TargetParser/ARMTargetParser.cpp -+++ b/llvm/lib/TargetParser/ARMTargetParser.cpp -@@ -603,6 +603,15 @@ StringRef ARM::getARMCPUForArch(const ll - if (MArch == "v7k") - return "cortex-a7"; - break; -+ case llvm::Triple::Linux: -+ switch (Triple.getEnvironment()) { -+ case llvm::Triple::GNUEABI: -+ return "arm9e"; // armv5te -+ case llvm::Triple::GNUEABIHF: -+ return "cortex-a7"; // armv7-a -+ default: -+ return "armv5"; -+ } - default: - break; - } diff --git a/debian/patches/series b/debian/patches/series index dcad68f3..9fbab5b3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -147,4 +147,3 @@ bolt-disable-emit-relocs.patch link-grpc.diff libclang-major-version-only.diff D148945-revert.diff -arm32-defaults.diff From 9aa5a6b0138255d90c1145496a2831af36ade67b Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 5 Dec 2023 09:43:34 +0100 Subject: [PATCH 081/302] * Set the cpu defaults for the ARM32 architectures: - armel: arm926ej-s. Addresses: #1056115. - armhf: cortex-a8. Thanks to Arnd Bergmann and Ard Biesheuvel for the fixes. --- debian/changelog | 7 +++++-- debian/patches/arm32-defaults.diff | 14 ++++++++++++++ debian/patches/series | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 debian/patches/arm32-defaults.diff diff --git a/debian/changelog b/debian/changelog index bea680b9..72ce7b1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp2) UNRELEASED; urgency=medium - * revert debian/patches/arm32-defaults.diff for causing - https://lore.kernel.org/lkml/20231204225148.GA2094126@dev-arch.thelio-3990X/T/ + [ Matthias Klose ] + * Set the cpu defaults for the ARM32 architectures: + - armel: arm926ej-s. Addresses: #1056115. + - armhf: cortex-a8. + Thanks to Arnd Bergmann and Ard Biesheuvel for the fixes. -- Sylvestre Ledru Tue, 05 Dec 2023 07:43:43 +0100 diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff new file mode 100644 index 00000000..d3c6ece0 --- /dev/null +++ b/debian/patches/arm32-defaults.diff @@ -0,0 +1,14 @@ +--- a/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ b/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -637,9 +637,9 @@ StringRef ARM::getARMCPUForArch(const ll + case llvm::Triple::EABIHF: + case llvm::Triple::GNUEABIHF: + case llvm::Triple::MuslEABIHF: +- return "cortex-a7"; ++ return "cortex-a8"; + default: +- return "arm7tdmi"; ++ return "arm926ej-s"; + } + } + diff --git a/debian/patches/series b/debian/patches/series index 9fbab5b3..dcad68f3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -147,3 +147,4 @@ bolt-disable-emit-relocs.patch link-grpc.diff libclang-major-version-only.diff D148945-revert.diff +arm32-defaults.diff From b8493837557f8586ea71905065cb6e6f78301b9e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 6 Dec 2023 10:01:37 +0100 Subject: [PATCH 082/302] * Apply the proposed fix for D158491, build failure on mips64el, still unreviewed upstream. Addresses: #1056116. --- debian/changelog | 2 ++ debian/patches/D158491.diff | 53 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 56 insertions(+) create mode 100644 debian/patches/D158491.diff diff --git a/debian/changelog b/debian/changelog index 72ce7b1a..336ea732 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp2) UNRELEASED; - armel: arm926ej-s. Addresses: #1056115. - armhf: cortex-a8. Thanks to Arnd Bergmann and Ard Biesheuvel for the fixes. + * Apply the proposed fix for D158491, build failure on mips64el, still + unreviewed upstream. Addresses: #1056116. -- Sylvestre Ledru Tue, 05 Dec 2023 07:43:43 +0100 diff --git a/debian/patches/D158491.diff b/debian/patches/D158491.diff new file mode 100644 index 00000000..1ce768e1 --- /dev/null +++ b/debian/patches/D158491.diff @@ -0,0 +1,53 @@ +see https://reviews.llvm.org/D158491, still unreviewed upstream + +--- a/compiler-rt/lib/interception/interception.h ++++ b/compiler-rt/lib/interception/interception.h +@@ -199,8 +199,9 @@ + ".type " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", %function\n" \ + SANITIZER_STRINGIFY(TRAMPOLINE(func)) ":\n" \ + SANITIZER_STRINGIFY(CFI_STARTPROC) "\n" \ +- SANITIZER_STRINGIFY(ASM_TAIL_CALL) " __interceptor_" \ +- SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func)) "\n" \ ++ C_ASM_TAIL_CALL(SANITIZER_STRINGIFY(TRAMPOLINE(func)), \ ++ "__interceptor_" \ ++ SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func))) "\n" \ + SANITIZER_STRINGIFY(CFI_ENDPROC) "\n" \ + ".size " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", " \ + ".-" SANITIZER_STRINGIFY(TRAMPOLINE(func)) "\n" \ +--- a/compiler-rt/lib/sanitizer_common/sanitizer_asm.h ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +@@ -44,6 +44,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 +@@ -53,6 +55,25 @@ + # define ASM_TAIL_CALL tail + #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 dcad68f3..ddd0f6dd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -148,3 +148,4 @@ link-grpc.diff libclang-major-version-only.diff D148945-revert.diff arm32-defaults.diff +D158491.diff From 60d6dd5b5d0fd776a10eb8275cc67ddb5a754860 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Dec 2023 18:38:44 +0100 Subject: [PATCH 083/302] prepare upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 336ea732..0410788e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp2) UNRELEASED; -- Sylvestre Ledru Tue, 05 Dec 2023 07:43:43 +0100 -llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:18~++20231203063627+9f78edbd20ed-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] * replace python3-recommonmark by myst-parser @@ -38,7 +38,7 @@ llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp1) experimental [ John Paul Adrian Glaubitz ] * Don't install *clang_rt* on sparc and sparc64 - -- Sylvestre Ledru Sun, 03 Dec 2023 10:21:45 +0100 + -- Sylvestre Ledru Sun, 03 Dec 2023 18:38:51 +0100 llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium From b6debd0c08ef9fc368b79cd650304554a3252b11 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Dec 2023 10:29:45 +0100 Subject: [PATCH 084/302] rebase of the patch --- debian/patches/D158491.diff | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/patches/D158491.diff b/debian/patches/D158491.diff index 1ce768e1..925aefd0 100644 --- a/debian/patches/D158491.diff +++ b/debian/patches/D158491.diff @@ -1,9 +1,11 @@ see https://reviews.llvm.org/D158491, still unreviewed upstream ---- a/compiler-rt/lib/interception/interception.h -+++ b/compiler-rt/lib/interception/interception.h -@@ -199,8 +199,9 @@ - ".type " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", %function\n" \ +Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/interception/interception.h +=================================================================== +--- llvm-toolchain-snapshot_18~++20231206102350+b304873134e8.orig/compiler-rt/lib/interception/interception.h ++++ llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/interception/interception.h +@@ -205,8 +205,9 @@ const interpose_substitution substitutio + ASM_TYPE_FUNCTION_STR "\n" \ SANITIZER_STRINGIFY(TRAMPOLINE(func)) ":\n" \ SANITIZER_STRINGIFY(CFI_STARTPROC) "\n" \ - SANITIZER_STRINGIFY(ASM_TAIL_CALL) " __interceptor_" \ @@ -14,8 +16,10 @@ see https://reviews.llvm.org/D158491, still unreviewed upstream SANITIZER_STRINGIFY(CFI_ENDPROC) "\n" \ ".size " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", " \ ".-" SANITIZER_STRINGIFY(TRAMPOLINE(func)) "\n" \ ---- a/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -+++ b/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +=================================================================== +--- llvm-toolchain-snapshot_18~++20231206102350+b304873134e8.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h ++++ llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/sanitizer_common/sanitizer_asm.h @@ -44,6 +44,8 @@ #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__) From 9d80d3d62e4511686c4727fdc3dca73bd3e507f1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Dec 2023 10:35:19 +0100 Subject: [PATCH 085/302] rename of the patch --- debian/patches/{D158491.diff => mips/D154390-pre-R6.diff} | 0 debian/patches/series | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename debian/patches/{D158491.diff => mips/D154390-pre-R6.diff} (100%) diff --git a/debian/patches/D158491.diff b/debian/patches/mips/D154390-pre-R6.diff similarity index 100% rename from debian/patches/D158491.diff rename to debian/patches/mips/D154390-pre-R6.diff diff --git a/debian/patches/series b/debian/patches/series index ddd0f6dd..170f00de 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -148,4 +148,4 @@ link-grpc.diff libclang-major-version-only.diff D148945-revert.diff arm32-defaults.diff -D158491.diff +mips/D154390-pre-R6.diff From 295214f8d071bce6d550091f6cfda187e14db8e2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Dec 2023 17:08:31 +0100 Subject: [PATCH 086/302] cherry pick the change from 17 about the cmake --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 4e685647..075c9be0 100755 --- a/debian/rules +++ b/debian/rules @@ -1254,8 +1254,8 @@ endif # 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 -# Adjust to the existing symlink. See #994827 - sed -i "s|libclang-$(LLVM_VERSION).so.$(LLVM_VERSION).*\"|libclang-$(LLVM_VERSION).so.1\"|" $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake +# Adjust to the existing symlink. See #994827 #1057151 + sed -i "s|libclang-$(LLVM_VERSION).so.$(LLVM_VERSION).*\"|libclang-$(LLVM_VERSION).so.$(LLVM_VERSION)\"|" $(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 ff81119e587cadbb4bf2c87697a7c6136990b5fa Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 9 Dec 2023 23:31:35 +0100 Subject: [PATCH 087/302] 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 5822986b..5e45871b 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_18~++20231123105111+b71b32ba872f/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/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 remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,16 +16,16 @@ Index: llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20231209112655+5c8755f9f40e/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_18~++20231123105111+b71b32ba872f/llvm/tools/llvm-shlib/CMakeLists.txt -@@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB) +--- 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}) + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + list(REMOVE_DUPLICATES LIB_NAMES) - if((MINGW) OR (HAIKU) - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") + if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) From 6687fb05272b57d1319b8e96c79c9432a20fcece Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 11 Dec 2023 10:35:09 +0100 Subject: [PATCH 088/302] * New snapshot release * Fix a libc++ conflicts (Closes: #1057899) --- debian/changelog | 8 ++++++-- debian/control | 14 ++------------ debian/control.in | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb8d245f..6a1b0682 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp1) experimental; urgency=medium [ Matthias Klose ] * Set the cpu defaults for the ARM32 architectures: @@ -8,7 +8,11 @@ llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp2) UNRELEASED; * Apply the proposed fix for D158491, build failure on mips64el, still unreviewed upstream. Addresses: #1056116. - -- Sylvestre Ledru Tue, 05 Dec 2023 07:43:43 +0100 + [ Sylvestre Ledru ] + * New snapshot release + * Fix a libc++ conflicts (Closes: #1057899) + + -- Sylvestre Ledru Mon, 11 Dec 2023 10:26:59 +0100 llvm-toolchain-snapshot (1:18~++20231203063627+9f78edbd20ed-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 58a559b6..51299311 100644 --- a/debian/control +++ b/debian/control @@ -186,8 +186,6 @@ Package: libclang-rt-18-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Compiler-rt - development package This package provides various libraries: @@ -204,10 +202,7 @@ Package: libclang-rt-18-dev-wasm32 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-18-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm32 builtins Provides the compiler-rt builtins for WebAssembly 32 bits @@ -215,10 +210,7 @@ Package: libclang-rt-18-dev-wasm64 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-18-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm64 builtins Provides the compiler-rt builtins for WebAssembly 64 bits @@ -228,8 +220,6 @@ Package: libpolly-18-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: High-level loop and data-locality optimizer Uses an abstract mathematical representation based on integer polyhedra @@ -688,10 +678,10 @@ Architecture: any Multi-Arch: same Depends: libc++1-18 (= ${binary:Version}), ${misc:Depends}, libunwind-18-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] -Breaks: libc++-dev (<< 44), libc++abi-17-dev (<< 1:18~++20231203101651+e3b3c91dd0bb-1) +Breaks: libc++-dev (<< 44), libc++abi-18-dev (<< 1:18~++20231211102647+75193b192ad9-1) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -Replaces: libc++-x.y-dev, libc++abi-17-dev (<< 1:18~++20231203101651+e3b3c91dd0bb-1) +Replaces: libc++-x.y-dev, libc++abi-18-dev (<< 1:18~++20231211102647+75193b192ad9-1) Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library . diff --git a/debian/control.in b/debian/control.in index f20e3561..c31e40af 100644 --- a/debian/control.in +++ b/debian/control.in @@ -678,10 +678,10 @@ Architecture: any Multi-Arch: same Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}, libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] -Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231203101651+e3b3c91dd0bb-1) +Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231211102647+75193b192ad9-1) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -Replaces: libc++-x.y-dev, libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231203101651+e3b3c91dd0bb-1) +Replaces: libc++-x.y-dev, libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231211102647+75193b192ad9-1) Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library . From 35c0ede504fa776f375916c3585653443c90b72b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Dec 2023 21:56:20 +0100 Subject: [PATCH 089/302] rebase of the patch --- .../libcxx-libatomic-only-with-gcc-rtlib.diff | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) 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 8020fdef..b750c4f0 100644 --- a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff +++ b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff @@ -1,19 +1,20 @@ if libatomic is found only link it if libgcc is the rtlib -Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20231213094656+c02d07fdf007/libcxx/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxx/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt -@@ -707,12 +707,14 @@ function(cxx_link_system_libraries targe +--- 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 + endif() + elseif (LIBCXX_HAS_GCC_LIB) + target_link_libraries(${target} PRIVATE gcc) ++ if (LIBCXX_HAS_ATOMIC_LIB) ++ target_link_libraries(${target} PRIVATE atomic) ++ endif() + elseif (LIBCXX_HAS_GCC_S_LIB) + target_link_libraries(${target} PRIVATE gcc_s) endif() - elseif (LIBCXX_HAS_GCC_LIB) - target_link_libraries(${target} PRIVATE gcc) -+ if (LIBCXX_HAS_ATOMIC_LIB) -+ target_link_libraries(${target} PRIVATE atomic) -+ endif() - elseif (LIBCXX_HAS_GCC_S_LIB) - target_link_libraries(${target} PRIVATE gcc_s) - endif() -- + - if (LIBCXX_HAS_ATOMIC_LIB) - target_link_libraries(${target} PRIVATE atomic) + if (LIBCXX_HAS_ATOMIC_LIB) From 2adf1da1efff7e90a86be95804f1e8b7346966ac Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 18 Dec 2023 23:23:58 +0100 Subject: [PATCH 090/302] rebase of the patch --- .../libcxx/libcxx-silent-test-libcxx.diff | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff index e6a642b0..15c3595f 100644 --- a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff +++ b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +Index: llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp -+++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +--- llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp ++++ llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp @@ -11,6 +11,8 @@ // template // RealType generate_canonical(URNG& g); @@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/re/re.traits/isctype.pass.cpp +Index: llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396/libcxx/test/std/re/re.traits/isctype.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp -+++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/re/re.traits/isctype.pass.cpp +--- llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp ++++ llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396/libcxx/test/std/re/re.traits/isctype.pass.cpp @@ -12,6 +12,7 @@ // bool isctype(charT c, char_class_type f) const; @@ -23,23 +23,23 @@ Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxxabi/test/catch_multi_level_pointer.pass.cpp +Index: llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396/libcxxabi/test/catch_multi_level_pointer.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp -+++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxxabi/test/catch_multi_level_pointer.pass.cpp -@@ -11,6 +11,8 @@ - // 1b00fc5d8133 made it in the dylib in macOS 10.11 - // XFAIL: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.{{9|10}} +--- llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp ++++ llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396/libcxxabi/test/catch_multi_level_pointer.pass.cpp +@@ -15,6 +15,8 @@ + // memory and this test requires almost 5 MB + // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME +// XFAIL: * + #include #include #include -Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +Index: llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp -+++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +--- llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp ++++ llvm-toolchain-snapshot_18~++20231218053220+7b1e4239b396/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp @@ -15,6 +15,8 @@ // template void construct(T* p, Args&&... args); From c659ae9a28148007f2894ba069a38eb67d711d74 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 20 Dec 2023 10:17:53 +0100 Subject: [PATCH 091/302] refresh libomp5 symbol list --- debian/changelog | 6 ++++++ debian/libomp5-X.Y.symbols.in | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a1b0682..9c3413d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp2) experimental; urgency=medium + + * refresh libomp5 symbol list + + -- + llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp1) experimental; urgency=medium [ Matthias Klose ] diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in index 2c788edd..ed02c9d8 100644 --- a/debian/libomp5-X.Y.symbols.in +++ b/debian/libomp5-X.Y.symbols.in @@ -919,8 +919,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_set_default_allocator@VERSION 8 __kmpc_set_lock@VERSION 0.20130412 __kmpc_set_nest_lock@VERSION 0.20130412 + __kmpc_set_thread_limit@VERSION 18 __kmpc_single@VERSION 0.20130412 __kmpc_task_allow_completion_event@VERSION 9 + __kmpc_task_get_depnode@VERSION 18 + __kmpc_task_get_successors@VERSION 18 __kmpc_task_reduction_get_th_data@VERSION 5.0 __kmpc_task_reduction_init@VERSION 5.0 __kmpc_task_reduction_modifier_fini@VERSION 9 @@ -1366,15 +1369,15 @@ libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_init_device_info@VERS1.0 17 __tgt_rtl_init_plugin@VERS1.0 17 __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 17 - __tgt_rtl_is_valid_binary_info@VERS1.0 17 __tgt_rtl_launch_kernel@VERS1.0 17 __tgt_rtl_load_binary@VERS1.0 17 __tgt_rtl_number_of_devices@VERS1.0 17 __tgt_rtl_print_device_info@VERS1.0 17 __tgt_rtl_query_async@VERS1.0 17 __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 __tgt_rtl_sync_event@VERS1.0 17 @@ -1401,15 +1404,15 @@ libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_init_device_info@VERS1.0 17 __tgt_rtl_init_plugin@VERS1.0 17 __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 17 - __tgt_rtl_is_valid_binary_info@VERS1.0 17 __tgt_rtl_launch_kernel@VERS1.0 17 __tgt_rtl_load_binary@VERS1.0 17 __tgt_rtl_number_of_devices@VERS1.0 17 __tgt_rtl_print_device_info@VERS1.0 17 __tgt_rtl_query_async@VERS1.0 17 __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 __tgt_rtl_sync_event@VERS1.0 17 @@ -1436,15 +1439,15 @@ libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_init_device_info@VERS1.0 17 __tgt_rtl_init_plugin@VERS1.0 17 __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 17 - __tgt_rtl_is_valid_binary_info@VERS1.0 17 __tgt_rtl_launch_kernel@VERS1.0 17 __tgt_rtl_load_binary@VERS1.0 17 __tgt_rtl_number_of_devices@VERS1.0 17 __tgt_rtl_print_device_info@VERS1.0 17 __tgt_rtl_query_async@VERS1.0 17 __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 __tgt_rtl_sync_event@VERS1.0 17 @@ -1454,6 +1457,7 @@ libomptarget.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# VERS1.0@VERS1.0 17 __kmpc_push_target_tripcount@VERS1.0 17 __kmpc_push_target_tripcount_mapper@VERS1.0 17 + __tgt_activate_record_replay@VERS1.0 18 __tgt_init_all_rtls@VERS1.0 17 __tgt_interop_destroy@VERS1.0 17 __tgt_interop_init@VERS1.0 17 @@ -1516,4 +1520,6 @@ libomptarget.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# omp_target_memcpy_async@VERS1.0 17 omp_target_memcpy_rect@VERS1.0 17 omp_target_memcpy_rect_async@VERS1.0 17 + omp_target_memset@VERS1.0 18 + omp_target_memset_async@VERS1.0 18 ompt_libomptarget_connect@VERS1.0 17 From 5a693e2501bc33046c93f2f15074215226a3cdc3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 9 Jan 2024 23:42:35 +0100 Subject: [PATCH 092/302] rebase of the patch --- debian/patches/openmp-fix-runtimes-build.diff | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 1d6caad4..1c44298e 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -2,11 +2,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 <<<<<<< Updated upstream -Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/llvm/runtimes/CMakeLists.txt -@@ -236,6 +236,7 @@ function(runtime_default_target) +--- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/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} -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS} @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/llvm/runtimes/CM -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -496,7 +497,7 @@ if(runtimes) +@@ -513,7 +514,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_17~++20230707101520+336d7281ad61/llvm/runtimes/CM # We need to add the runtimes as a dependency because compiler-rt can be # built as part of runtimes and we need the profile runtime for PGO add_dependencies(clang-bootstrap-deps runtimes) -Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/CMakeLists.txt -@@ -94,6 +94,28 @@ else() +--- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/CMakeLists.txt +@@ -111,6 +111,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,24 +56,24 @@ Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/CMakeList # Build host runtime library, after LIBOMPTARGET variables are set since they are needed # to enable time profiling support in the OpenMP runtime. add_subdirectory(runtime) -Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/plugins-nextgen/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/CMakeLists.txt -@@ -62,6 +62,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma - "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports") - endif() +--- 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 + "-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_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt + # 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 =================================================================== ---- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt -@@ -84,6 +84,8 @@ else() +--- 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 +@@ -80,6 +80,8 @@ else() " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() @@ -82,11 +82,11 @@ Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptar # Install plugin under the lib destination folder. install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") set_target_properties(omptarget.rtl.cuda PROPERTIES -Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/libomptarget/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/src/CMakeLists.txt -@@ -36,7 +36,9 @@ add_llvm_library(omptarget +--- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/libomptarget/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/libomptarget/src/CMakeLists.txt +@@ -41,7 +41,9 @@ add_llvm_library(omptarget omp NO_INSTALL_RPATH @@ -97,11 +97,11 @@ Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptar target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/CMakeLists.txt -@@ -292,6 +292,10 @@ if(LIBOMP_STATS) +--- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/CMakeLists.txt +@@ -318,6 +318,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -112,11 +112,11 @@ Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/C # Shared library can be switched to a static library set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL "Shared library instead of static library?") -Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/src/CMakeLists.txt -@@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM +--- llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/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) set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) @@ -124,7 +124,7 @@ Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/s else() set(LIBOMP_LINKER_LANGUAGE CXX) endif() -@@ -200,6 +201,8 @@ else() +@@ -205,6 +206,8 @@ else() ) endif() @@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/s # Get the library's location within the build tree for the unit tester if(NOT WIN32) get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY) -Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_18~++20240109113757+a7262d2d9bee/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/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 @@ -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 e9763263608856c9e25fa09150f29931032835c8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 12 Jan 2024 10:29:47 +0100 Subject: [PATCH 093/302] change the order of coverity/sccache --- debian/rules | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/rules b/debian/rules index 93d9f82d..fb5b8b8e 100755 --- a/debian/rules +++ b/debian/rules @@ -520,20 +520,6 @@ ifeq ($(shell test -e /tmp/cmake/bin/cmake && echo -n yes),yes) export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/ endif -SCCACHE_ENABLE=no -SCCACHE_CMAKE = -# if sccache is installed in the chroot, use it -ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes) - ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) - STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE) - SCCACHE_ENABLE=yes - SCCACHE_PATH=/opt/sccache/ - SCCACHE_CMD=$(SCCACHE_PATH)/sccache - SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD) - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache - endif -endif - COVERITY_ENABLE=0 ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS))) # enable the build using coverity @@ -551,6 +537,20 @@ ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS))) RUN_TEST=no endif +SCCACHE_ENABLE=no +SCCACHE_CMAKE = +# if sccache is installed in the chroot, use it +ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes) + ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) + STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE) + SCCACHE_ENABLE=yes + SCCACHE_PATH=/opt/sccache/ + SCCACHE_CMD=$(SCCACHE_PATH)/sccache + SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD) + export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache + endif +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 From fcf132b2c9dfc16a2dc178b6e51ebf3999300363 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 12 Jan 2024 10:36:24 +0100 Subject: [PATCH 094/302] disable sccache when building with coverity --- debian/rules | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index fb5b8b8e..dc305813 100755 --- a/debian/rules +++ b/debian/rules @@ -542,15 +542,16 @@ SCCACHE_CMAKE = # if sccache is installed in the chroot, use it ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes) ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) - STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE) - SCCACHE_ENABLE=yes - SCCACHE_PATH=/opt/sccache/ - SCCACHE_CMD=$(SCCACHE_PATH)/sccache - SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD) - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache - endif + ifeq ($(COVERITY_ENABLE),0) # Only enable SCCache if Coverity is not enabled + STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE) + SCCACHE_ENABLE=yes + SCCACHE_PATH=/opt/sccache/ + SCCACHE_CMD=$(SCCACHE_PATH)/sccache + SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=$(SCCACHE_CMD) -DCMAKE_CXX_COMPILER_LAUNCHER=$(SCCACHE_CMD) + export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/opt/sccache + endif + endif 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 From d5816efd6662f6e6620c36ea9534897e3c604daf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 12 Jan 2024 18:33:44 +0100 Subject: [PATCH 095/302] For the usage of -DLIBCXXABI_USE_LLVM_UNWINDER=OFF when we don't build unwind https://github.com/llvm/llvm-project/issues/77846 --- debian/changelog | 4 +++- debian/rules | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9c3413d3..076a0e89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp2) experimental; urgency=medium * 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 - -- + -- Sylvestre Ledru Fri, 12 Jan 2024 18:33:31 +0100 llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp1) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index dc305813..3a327daf 100755 --- a/debian/rules +++ b/debian/rules @@ -344,6 +344,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel mips64el hurd-i386 po # do not use compiler-rt builtins for libcxx (libcxxabi) when libunwind is # disabled since the gnu implementation in libgcc_s will then be required LIBCXX_USE_COMPILER_RT := OFF +# See https://github.com/llvm/llvm-project/issues/77846 + STAGE_ALL_CMAKE_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=OFF else RUNTIMES += ;libunwind STAGE_ALL_CMAKE_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=ON From a7fbe8483a0dd98308be8060e97cba9f2607ad3d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 17 Jan 2024 09:17:43 +0100 Subject: [PATCH 096/302] rebase of the patch --- debian/patches/mips/D154390-pre-R6.diff | 26 +++++-------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/debian/patches/mips/D154390-pre-R6.diff b/debian/patches/mips/D154390-pre-R6.diff index 925aefd0..f311b6e9 100644 --- a/debian/patches/mips/D154390-pre-R6.diff +++ b/debian/patches/mips/D154390-pre-R6.diff @@ -1,25 +1,9 @@ see https://reviews.llvm.org/D158491, still unreviewed upstream -Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/interception/interception.h +Index: llvm-toolchain-snapshot_18~++20240117091415+da0755f7b7cc/compiler-rt/lib/sanitizer_common/sanitizer_asm.h =================================================================== ---- llvm-toolchain-snapshot_18~++20231206102350+b304873134e8.orig/compiler-rt/lib/interception/interception.h -+++ llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/interception/interception.h -@@ -205,8 +205,9 @@ const interpose_substitution substitutio - ASM_TYPE_FUNCTION_STR "\n" \ - SANITIZER_STRINGIFY(TRAMPOLINE(func)) ":\n" \ - SANITIZER_STRINGIFY(CFI_STARTPROC) "\n" \ -- SANITIZER_STRINGIFY(ASM_TAIL_CALL) " __interceptor_" \ -- SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func)) "\n" \ -+ C_ASM_TAIL_CALL(SANITIZER_STRINGIFY(TRAMPOLINE(func)), \ -+ "__interceptor_" \ -+ SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func))) "\n" \ - SANITIZER_STRINGIFY(CFI_ENDPROC) "\n" \ - ".size " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", " \ - ".-" SANITIZER_STRINGIFY(TRAMPOLINE(func)) "\n" \ -Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -=================================================================== ---- llvm-toolchain-snapshot_18~++20231206102350+b304873134e8.orig/compiler-rt/lib/sanitizer_common/sanitizer_asm.h -+++ llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/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 @@ #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__) @@ -29,8 +13,8 @@ Index: llvm-toolchain-snapshot_18~++20231206102350+b304873134e8/compiler-rt/lib/ #elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ defined(__powerpc__) || defined(__loongarch_lp64) # define ASM_TAIL_CALL b -@@ -53,6 +55,25 @@ - # define ASM_TAIL_CALL tail +@@ -76,6 +78,25 @@ + SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " i_func #endif +#if defined(__mips64) && __mips_isa_rev < 6 From 028803b99526a0959519bdc4ffcc31b63df1b722 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 19 Jan 2024 09:34:01 +0100 Subject: [PATCH 097/302] remove the unconditionnaly defined -DLIBUNWIND_USE_COMPILER_RT=ON --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index 3a327daf..9b819c18 100755 --- a/debian/rules +++ b/debian/rules @@ -767,7 +767,6 @@ endif -DCOMPILER_RT_INCLUDE_TESTS=OFF \ -DCOMPILER_RT_USE_LIBCXX=OFF \ -DCOMPILER_RT_USE_BUILTINS_LIBRARY=$(COMPILER_RT_USE_BUILTINS_LIBRARY) \ - -DLIBUNWIND_USE_COMPILER_RT=ON \ -DLIBUNWIND_INSTALL_LIBRARY=OFF \ -DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \ -DLIBCXXABI_USE_COMPILER_RT=$(LIBCXX_USE_COMPILER_RT) \ From de19e367c2d2d2dc0293ebc782bd943c88be6583 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 19 Jan 2024 09:34:37 +0100 Subject: [PATCH 098/302] remove the unconditionnaly defined -DLIBUNWIND_USE_COMPILER_RT=ON --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 076a0e89..ceb210c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp2) 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 -- Sylvestre Ledru Fri, 12 Jan 2024 18:33:31 +0100 From 49ab7c1cb2e1924ea2aee4fd24010744b872f2d5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 19 Jan 2024 14:58:47 +0100 Subject: [PATCH 099/302] Also pass -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF to libcxx-wasm32-wasi builds --- debian/changelog | 1 + debian/rules | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ceb210c1..152a2b8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp2) experimental * 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 + * Also pass -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF to libcxx-wasm32-wasi builds -- Sylvestre Ledru Fri, 12 Jan 2024 18:33:31 +0100 diff --git a/debian/rules b/debian/rules index 9b819c18..7b1f3f94 100755 --- a/debian/rules +++ b/debian/rules @@ -1006,7 +1006,8 @@ build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-% -DLIBCXXABI_ENABLE_THREADS:BOOL=OFF \ -DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF \ -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \ - -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF + -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \ + -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF ninja -C "$@" -j $(NJOBS) $(VERBOSE) endif From 1e35ae451dc10ffcc638348ba091d050fa8663c7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 14:01:13 +0100 Subject: [PATCH 100/302] fix merge --- debian/rules | 5 ----- 1 file changed, 5 deletions(-) diff --git a/debian/rules b/debian/rules index f4cf840b..a7240e81 100755 --- a/debian/rules +++ b/debian/rules @@ -763,11 +763,6 @@ endif -DCOMPILER_RT_INCLUDE_TESTS=OFF \ -DCOMPILER_RT_USE_LIBCXX=OFF \ -DCOMPILER_RT_USE_BUILTINS_LIBRARY=$(COMPILER_RT_USE_BUILTINS_LIBRARY) \ -<<<<<<< HEAD -======= - -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \ - -DLIBUNWIND_USE_COMPILER_RT=ON \ ->>>>>>> origin/17 -DLIBUNWIND_INSTALL_LIBRARY=OFF \ -DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \ -DLIBCXXABI_USE_COMPILER_RT=$(LIBCXX_USE_COMPILER_RT) \ From 16c9e480ce226b951ffb0f70d3b93071fa12dc26 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 14:03:41 +0100 Subject: [PATCH 101/302] remove old break/replace --- debian/control.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control.in b/debian/control.in index 3e5cec17..142f612b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -688,10 +688,10 @@ Multi-Arch: same Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}, libc++abi-@LLVM_VERSION@-dev (= ${binary:Version}), libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] -Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231211102647+75193b192ad9-1) +Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -Replaces: libc++-x.y-dev, libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231211102647+75193b192ad9-1) +Replaces: libc++-x.y-dev Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library . From b0202b9d7ad9a39818d3b0757510138d9d997942 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 14:05:28 +0100 Subject: [PATCH 102/302] remove old break/replace --- debian/control.in | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/control.in b/debian/control.in index 142f612b..fcd449a2 100644 --- a/debian/control.in +++ b/debian/control.in @@ -175,7 +175,7 @@ Architecture: all Multi-Arch: foreign Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, -Recommends: libclang-rt-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) +Recommends: libclang-rt-@LLVM_VERSION@-dev 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 @@ -619,7 +619,7 @@ Section: libdevel Architecture: amd64 arm64 armhf i386 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), libomp-dev (<< 44) +Breaks: libiomp-dev (<< 3.7-1) Provides: libomp-x.y-dev Conflicts: libomp-x.y-dev Replaces: libomp-x.y-dev @@ -632,7 +632,6 @@ Package: libomp5-@LLVM_VERSION@ Multi-Arch: same Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libomp5 (<< 44) Provides: libomp-x.y Conflicts: libomp-x.y Replaces: libomp-x.y @@ -664,7 +663,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: clang -Breaks: libc++1 (<< 44) Provides: libc++-x.y Conflicts: libc++-x.y Replaces: libc++-x.y @@ -688,7 +686,6 @@ Multi-Arch: same Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}, libc++abi-@LLVM_VERSION@-dev (= ${binary:Version}), libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] -Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev Replaces: libc++-x.y-dev @@ -736,7 +733,6 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libc++abi1 (<< 44) Provides: libc++abi-x.y Conflicts: libc++abi-x.y Replaces: libc++abi-x.y From 1f1f89223e89df7abfb88b55bb1de855e5c0caa9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 14:06:47 +0100 Subject: [PATCH 103/302] refresh of the control --- debian/control | 224 ++++++++++++++++++++++++------------------------- 1 file changed, 110 insertions(+), 114 deletions(-) diff --git a/debian/control b/debian/control index ce9b3fdb..d669b259 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-19 +Package: clang-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, - libllvm19 (= ${binary:Version}), - libclang-common-19-dev (= ${source:Version}), - llvm-19-linker-tools (= ${binary:Version}), - libclang1-19 (= ${binary:Version}), libc6-dev, binutils + libllvm18 (= ${binary:Version}), + libclang-common-18-dev (= ${source:Version}), + llvm-18-linker-tools (= ${binary:Version}), + libclang1-18 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-19-dev, python3 -# libomp-19-dev -Suggests: clang-19-doc, wasi-libc +Recommends: llvm-18-dev, python3 +# libomp-18-dev +Suggests: clang-18-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-19 +Package: clang-tools-18 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-19 (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-18 (= ${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-19 +Package: clang-format-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm19 (= ${binary:Version}) + libllvm18 (= ${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-19 +Package: clang-tidy-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm19 (= ${binary:Version}), - libclang-common-19-dev (= ${source:Version}), - clang-tools-19, python3-yaml + libllvm18 (= ${binary:Version}), + libclang-common-18-dev (= ${source:Version}), + clang-tools-18, 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-19 +Package: clangd-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libllvm19 (= ${binary:Version}), - libclang-common-19-dev (= ${source:Version}), + libllvm18 (= ${binary:Version}), + libclang-common-18-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-19-doc +Package: clang-18-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-19 +Package: libclang1-18 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-19-dev +Package: libclang-18-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang1-19 (= ${binary:Version}), - libclang-common-19-dev (= ${source:Version}) + ${dep:devlibs-objc}, libclang1-18 (= ${binary:Version}), + libclang-common-18-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-19. + libclang1-18. -Package: libclang-common-19-dev +Package: libclang-common-18-dev Architecture: all Multi-Arch: foreign Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, -Recommends: libclang-rt-19-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) +Recommends: libclang-rt-18-dev 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-19-dev +Package: libclang-rt-18-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-19-dev-wasm32 +Package: libclang-rt-18-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-19-dev-wasm64 +Package: libclang-rt-18-dev-wasm64 Architecture: all Multi-Arch: foreign Section: libdevel @@ -222,7 +222,7 @@ Description: Compiler-rt - wasm64 builtins # ------------- polly ------------- -Package: libpolly-19-dev +Package: libpolly-18-dev Architecture: any Multi-Arch: same Section: libdevel @@ -233,10 +233,10 @@ Description: High-level loop and data-locality optimizer # ------------- clang libraries ------------- -Package: libclang-cpp19 +Package: libclang-cpp18 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${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-cpp19-dev +Package: libclang-cpp18-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-cpp19 (= ${binary:Version}) -# Move of libclang-cpp.so into libclang-cpp19.dev + libclang-cpp18 (= ${binary:Version}) +# Move of libclang-cpp.so into libclang-cpp18.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-19-dev +Package: libfuzzer-18-dev Architecture: linux-any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-19 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-18 (= ${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-19 +Package: python3-clang-18 Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-19-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-18-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-19-examples +Package: clang-18-examples Architecture: all Multi-Arch: foreign Section: doc @@ -335,7 +335,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm19 +Package: libllvm18 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-19-linker-tools +Package: llvm-18-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-19 +Package: llvm-18 Architecture: any -Suggests: llvm-19-doc -Depends: llvm-19-runtime (= ${binary:Version}), - llvm-19-linker-tools (= ${binary:Version}), +Suggests: llvm-18-doc +Depends: llvm-18-runtime (= ${binary:Version}), + llvm-18-linker-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-19-dev +Recommends: llvm-18-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-19-runtime +Package: llvm-18-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-19-dev +Package: llvm-18-dev 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}), + llvm-18 (= ${binary:Version}), libllvm18 (= ${binary:Version}), libncurses-dev, + llvm-18-tools (= ${binary:Version}), libclang-cpp18 (= ${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-19-tools +Package: llvm-18-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-19-ocaml-dev +Package: libllvm-18-ocaml-dev Section: ocaml Architecture: amd64 arm64 armhf ppc64el s390x riscv64 -Suggests: llvm-19-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-19-dev (= ${binary:Version}) +Suggests: llvm-18-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-18-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-19-doc +Package: llvm-18-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-19-examples +Package: llvm-18-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-19-dev (>= ${source:Version}), llvm-19-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-18-dev (>= ${source:Version}), llvm-18-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-19 +Package: lld-18 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}, libllvm19 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${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-19 +Package: liblld-18 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}, libllvm19 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${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-19-dev +Package: liblld-18-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-19 (= ${binary:Version}), - liblld-19 (= ${binary:Version}), libzstd-dev, zlib1g-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, lld-18 (= ${binary:Version}), + liblld-18 (= ${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-19 +Package: lldb-18 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}), - python3-lldb-19 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}), + python3-lldb-18 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-19 +Package: liblldb-18 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}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${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-19 +Package: python3-lldb-18 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-19 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-18 (= ${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-19-dev +Package: liblldb-18-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-19 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-18 (= ${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,12 +614,12 @@ 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-19-dev +Package: libomp-18-dev Section: libdevel Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 -Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: libomp-19-doc -Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) +Depends: libomp5-18 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: libomp-18-doc +Breaks: libiomp-dev (<< 3.7-1) Provides: libomp-x.y-dev Conflicts: libomp-x.y-dev Replaces: libomp-x.y-dev @@ -628,11 +628,10 @@ Description: LLVM OpenMP runtime - dev package linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp5-19 +Package: libomp5-18 Multi-Arch: same Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libomp5 (<< 44) Provides: libomp-x.y Conflicts: libomp-x.y Replaces: libomp-x.y @@ -641,7 +640,7 @@ Description: LLVM OpenMP runtime linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp-19-doc +Package: libomp-18-doc Section: doc Architecture: all Multi-Arch: foreign @@ -657,14 +656,13 @@ Description: LLVM OpenMP runtime - Documentation # ------------- libcxx ------------- -Package: libc++1-19 +Package: libc++1-18 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: clang -Breaks: libc++1 (<< 44) Provides: libc++-x.y Conflicts: libc++-x.y Replaces: libc++-x.y @@ -681,17 +679,16 @@ Description: LLVM C++ Standard library as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-19-dev +Package: libc++-18-dev Section: libdevel Architecture: any Multi-Arch: same -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) +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] Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -Replaces: libc++-x.y-dev, libc++abi-19-dev (<< 1:19~++20231211102647+75193b192ad9-1) +Replaces: libc++-x.y-dev Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library . @@ -705,11 +702,11 @@ Description: LLVM C++ Standard library (development files) as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-19-dev-wasm32 +Package: libc++-18-dev-wasm32 Section: libdevel Architecture: all Multi-Arch: foreign -Depends: wasi-libc, libc++abi-19-dev-wasm32, ${misc:Depends} +Depends: wasi-libc, libc++abi-18-dev-wasm32, ${misc:Depends} Provides: libc++-x.y-dev-wasm32 Conflicts: libc++-x.y-dev-wasm32 Replaces: libc++-x.y-dev-wasm32 @@ -730,13 +727,12 @@ Description: LLVM C++ Standard library (WASI) # ------------- libcxxabi ------------- -Package: libc++abi1-19 +Package: libc++abi1-18 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libc++abi1 (<< 44) Provides: libc++abi-x.y Conflicts: libc++abi-x.y Replaces: libc++abi-x.y @@ -749,11 +745,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-19-dev +Package: libc++abi-18-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++abi1-19 (= ${binary:Version}), ${misc:Depends} +Depends: libc++abi1-18 (= ${binary:Version}), ${misc:Depends} Breaks: libc++abi-dev (<= 44) Provides: libc++abi-x.y-dev Conflicts: libc++abi-x.y-dev @@ -767,7 +763,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-19-dev-wasm32 +Package: libc++abi-18-dev-wasm32 Section: libdevel Architecture: all Multi-Arch: foreign @@ -788,14 +784,14 @@ Description: LLVM low level support for a standard C++ library (WASI) # ------------- libclc ------------- -Package: libclc-19 +Package: libclc-18 Section: libs Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, - libclc-19-dev (= ${binary:Version}), - libclang-common-19-dev, + libclc-18-dev (= ${binary:Version}), + libclang-common-18-dev, Breaks: libclc-amdgcn, libclc-ptx, libclc-r600 Provides: libclc-x.y Conflicts: libclc-x.y @@ -807,7 +803,7 @@ Description: OpenCL C language implementation - platform support This package contains support for the amdgcn (AMD GPU), PTX and r600 platforms. -Package: libclc-19-dev +Package: libclc-18-dev Section: libdevel Architecture: all Multi-Arch: foreign @@ -825,7 +821,7 @@ Description: OpenCL C language implementation - development files # ------------- libunwind ------------- -Package: libunwind-19 +Package: libunwind-18 Section: libs Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same @@ -842,13 +838,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-19-dev +Package: libunwind-18-dev Section: libdevel Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${misc:Depends}, - libunwind-19 (= ${binary:Version}) + libunwind-18 (= ${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 +858,7 @@ Description: production-quality unwinder # ------------- mlir ------------- -Package: mlir-19-tools +Package: mlir-18-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Multi-Level Intermediate Representation tools @@ -873,7 +869,7 @@ Description: Multi-Level Intermediate Representation tools . This package provides tools. -Package: libmlir-19 +Package: libmlir-18 Section: libs Architecture: any Multi-Arch: same @@ -889,13 +885,13 @@ Description: Multi-Level Intermediate Representation library specific compilers, and aid in connecting existing compilers together. -Package: libmlir-19-dev +Package: libmlir-18-dev Section: libdevel Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libmlir-19 (= ${binary:Version}) + libmlir-18 (= ${binary:Version}) Breaks: libmlir-dev Provides: libmlir-x.y-dev Conflicts: libmlir-x.y-dev @@ -909,16 +905,16 @@ Description: Multi-Level Intermediate Representation library # ------------- bolt ------------- -Package: bolt-19 +Package: bolt-18 Architecture: amd64 # Disable on arm64 because libbolt_rt_hugify.a isn't generated -Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-19-dev (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-18-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-19-dev +Package: libbolt-18-dev Section: libdevel Architecture: amd64 #arm64 @@ -929,11 +925,11 @@ Description: Post-link optimizer # ------------- flang ------------- -Package: flang-19 +Package: flang-18 # 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-19-dev (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-18-dev (= ${binary:Version}), Provides: fortran-compiler, gfortran-mod-15 Description: Fortran compiler Ground-up implementation of a Fortran front end written in @@ -942,7 +938,7 @@ Description: Fortran compiler While it is capable of generating executables for a number of examples, some functionalities are still missing. -Package: libflang-19-dev +Package: libflang-18-dev Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, From d1e6fa6dc3af4c5a6de953a1e7867938eabc5fa7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 14:07:30 +0100 Subject: [PATCH 104/302] Branching of 18 --- debian/changelog | 3 ++- debian/control | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 48581e22..94c71ce0 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-18 (1:18~++20231211102647+75193b192ad9-1~exp2) experimental; urgency=medium + * Branching of 18 * 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 diff --git a/debian/control b/debian/control index d669b259..9725e9a3 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-snapshot +Source: llvm-toolchain-18 Section: devel Priority: optional Rules-Requires-Root: no @@ -35,8 +35,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 18 +Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/18 # ------------- clang ------------- From 417b996088464706739baffc2f3bd4e733b99d7c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 16:40:18 +0100 Subject: [PATCH 105/302] upgrade of the version --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 94c71ce0..171accc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-18 (1:18~++20231211102647+75193b192ad9-1~exp2) experimental; urgency=medium +llvm-toolchain-18 (1:18~++20240124033649+22683463740e-1~exp1) experimental; urgency=medium * Branching of 18 * refresh libomp5 symbol list From 89818eb94654f56884a6f876ecaad9a77d889fc6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jan 2024 22:14:23 +0100 Subject: [PATCH 106/302] prepare 18 upload --- debian/changelog | 4 ++-- debian/unpack.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 171accc7..495d3784 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-18 (1:18~++20240124033649+22683463740e-1~exp1) experimental; urgency=medium +llvm-toolchain-18 (1:18~++20240124100819+22683463740e-1~exp1) experimental; urgency=medium * Branching of 18 * refresh libomp5 symbol list @@ -7,7 +7,7 @@ llvm-toolchain-18 (1:18~++20240124033649+22683463740e-1~exp1) experimental; urge * 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 Wed, 24 Jan 2024 22:14:15 +0100 llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp1) experimental; urgency=medium diff --git a/debian/unpack.sh b/debian/unpack.sh index 155dbc76..c1b8b681 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -1,5 +1,5 @@ set -e -ORIG_VERSION=snapshot +ORIG_VERSION=18 MAJOR_VERSION=18 # 8.0.1 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru` From 6b5f8935a3bb0527dd8f25da0beaf0214c47dc43 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Jan 2024 09:46:26 +0100 Subject: [PATCH 107/302] fix changelog --- debian/changelog | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 495d3784..e879ee05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-18 (1:18~++20240124100819+22683463740e-1~exp1) experimental; urgency=medium +llvm-toolchain-18 (1:18~++20240126094319+0991d3c7b53d-1~exp1) experimental; urgency=medium * Branching of 18 * refresh libomp5 symbol list @@ -7,7 +7,7 @@ llvm-toolchain-18 (1:18~++20240124100819+22683463740e-1~exp1) experimental; urge * remove the unconditionnaly defined -DLIBUNWIND_USE_COMPILER_RT=ON * Also pass -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF to libcxx-wasm32-wasi builds - -- Sylvestre Ledru Wed, 24 Jan 2024 22:14:15 +0100 + -- Sylvestre Ledru Fri, 26 Jan 2024 09:44:56 +0100 llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp1) experimental; urgency=medium @@ -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 fc5416c7677d59d4bb7026be593b542375bbdedb Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 27 Jan 2024 19:41:54 +0100 Subject: [PATCH 108/302] control: Avoid hello build-dep getting pulled in on buildds If we use foo [amd64] | hello, bar | hello on non-amd64 archs this gets reduced to hello, bar | hello And thus hello gets installed, and thus bar does not get installed. In the llvm-toolchain package case, this leads to wasi-libc not getting installed as expected in experimental builds, as can be seen in various archs: https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-snapshot&arch=hurd-i386&ver=1%3A19~%2B%2B20240125092523%2B41fe98a6e7e5-1~exp1&stamp=1706212747&raw=0 https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-snapshot&arch=ia64&ver=1%3A19~%2B%2B20240125092523%2B41fe98a6e7e5-1~exp1&stamp=1706212238&raw=0 https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-snapshot&arch=loong64&ver=1%3A19~%2B%2B20240125092523%2B41fe98a6e7e5-1~exp1&stamp=1706211390&raw=0 https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-snapshot&arch=x32&ver=1%3A19~%2B%2B20240125092523%2B41fe98a6e7e5-1~exp1&stamp=1706211402&raw=0 So we should rather be using: foo [amd64] | hello [amd64], bar | hello i.e. keep the constraints coherent, so that on non-amd64 this gets translated to bar | hello which will not unexpectedly install the hello package, and properly install bar. --- debian/changelog | 6 ++++++ debian/control | 8 +++++--- debian/control.in | 8 +++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e879ee05..07658b58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18~++20240126094319+0991d3c7b53d-1~exp2) UNRELEASED; urgency=medium + + * control: Avoid hello build-dep getting pulled in on buildds. + + -- Samuel Thibault Sat, 27 Jan 2024 19:41:35 +0100 + llvm-toolchain-18 (1:18~++20240126094319+0991d3c7b53d-1~exp1) experimental; urgency=medium * Branching of 18 diff --git a/debian/control b/debian/control index 9725e9a3..f6cdae61 100644 --- a/debian/control +++ b/debian/control @@ -23,15 +23,17 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello, - spirv-tools [linux-any] | hello [!i386], +# "| 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] , + 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] -# "| hello" is for older buster/bionic distros without spirv support Build-Conflicts: oprofile Standards-Version: 4.6.2 Homepage: https://www.llvm.org/ diff --git a/debian/control.in b/debian/control.in index fcd449a2..d47e0cc4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,15 +23,17 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello, - spirv-tools [linux-any] | hello [!i386], +# "| 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] , + 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] -# "| hello" is for older buster/bionic distros without spirv support Build-Conflicts: oprofile Standards-Version: 4.6.2 Homepage: https://www.llvm.org/ From 0b7d4d6ccf5d13c9060d20bfa1d93d3a1814bd9c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Jan 2024 10:02:50 +0100 Subject: [PATCH 109/302] document why 18.1.0 --- debian/changelog | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07658b58..8c13393f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,8 @@ -llvm-toolchain-18 (1:18~++20240126094319+0991d3c7b53d-1~exp2) UNRELEASED; urgency=medium - - * control: Avoid hello build-dep getting pulled in on buildds. - - -- Samuel Thibault Sat, 27 Jan 2024 19:41:35 +0100 - -llvm-toolchain-18 (1:18~++20240126094319+0991d3c7b53d-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 + 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 @@ -15,6 +11,12 @@ llvm-toolchain-18 (1:18~++20240126094319+0991d3c7b53d-1~exp1) experimental; urge -- Sylvestre Ledru Fri, 26 Jan 2024 09:44:56 +0100 +llvm-toolchain-18 (1:18~++20240126094319+0991d3c7b53d-1~exp2) UNRELEASED; urgency=medium + + * control: Avoid hello build-dep getting pulled in on buildds. + + -- Samuel Thibault Sat, 27 Jan 2024 19:41:35 +0100 + llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp1) experimental; urgency=medium [ Matthias Klose ] From 9f699cd80cc55e598c6093a4f5fde471e948d6f2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 30 Jan 2024 13:21:24 +0100 Subject: [PATCH 110/302] First RC --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8c13393f..fa1dc56f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.0-rc1-1~exp1) experimental; urgency=medium + + * First RC + + -- Sylvestre Ledru Tue, 30 Jan 2024 09:01:06 +0100 + llvm-toolchain-18 (1:18.1.0~++20240126095841+0991d3c7b53d-1~exp1) experimental; urgency=medium * Branching of 18 From cf9481e21a577a239ab6b0adadbc9bbc316156f6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 30 Jan 2024 13:23:35 +0100 Subject: [PATCH 111/302] update of the changelog --- debian/changelog | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa1dc56f..2b828761 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ + +llvm-toolchain-18 (1:18.1.0-rc1-1~exp2) experimental; urgency=medium + + * control: Avoid hello build-dep getting pulled in on buildds. + + -- Samuel Thibault Sat, 27 Jan 2024 19:41:35 +0100 + llvm-toolchain-18 (1:18.1.0-rc1-1~exp1) experimental; urgency=medium * First RC @@ -17,12 +24,6 @@ llvm-toolchain-18 (1:18.1.0~++20240126095841+0991d3c7b53d-1~exp1) experimental; -- Sylvestre Ledru Fri, 26 Jan 2024 09:44:56 +0100 -llvm-toolchain-18 (1:18~++20240126094319+0991d3c7b53d-1~exp2) UNRELEASED; urgency=medium - - * control: Avoid hello build-dep getting pulled in on buildds. - - -- Samuel Thibault Sat, 27 Jan 2024 19:41:35 +0100 - llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp1) experimental; urgency=medium [ Matthias Klose ] From c23a68046aa9f816d41ad43ea19d6def02ea8de8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 25 Jan 2024 17:48:08 +0100 Subject: [PATCH 112/302] hwasan_symbolize is now built also on i386 --- debian/changelog | 5 +++++ debian/clang-tools-X.Y.install.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2b828761..33de0cbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +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-18 (1:18.1.0-rc1-1~exp2) experimental; urgency=medium 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 a95ae64bef11b0a2096ed3e88841a08d6f53acfc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 30 Jan 2024 20:47:26 +0100 Subject: [PATCH 113/302] fix changelog --- debian/changelog | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 33de0cbf..8bc54f3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,12 @@ -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-18 (1:18.1.0-rc1-1~exp2) experimental; urgency=medium + [ Samuel Thibault ] * control: Avoid hello build-dep getting pulled in on buildds. - -- Samuel Thibault Sat, 27 Jan 2024 19:41:35 +0100 + [ Sylvestre Ledru ] + * hwasan_symbolize is now built also on i386 + + -- Sylvestre Ledru Tue, 30 Jan 2024 20:47:12 +0100 llvm-toolchain-18 (1:18.1.0-rc1-1~exp1) experimental; urgency=medium From 0e510a0940c99aa60eadca0113bd9e849b7ec400 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 31 Jan 2024 10:38:20 +0100 Subject: [PATCH 114/302] Fixup versioning for rc and go for sid instead --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8bc54f3e..61eb37a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ -llvm-toolchain-18 (1:18.1.0-rc1-1~exp2) experimental; urgency=medium +llvm-toolchain-18 (1:18.1.0~rc1-1) unstable; urgency=medium [ Samuel Thibault ] * control: Avoid hello build-dep getting pulled in on buildds. + [ Gianfranco Costamagna ] + * Fixup rc versioning, and go for sid + [ Sylvestre Ledru ] * hwasan_symbolize is now built also on i386 - -- Sylvestre Ledru Tue, 30 Jan 2024 20:47:12 +0100 + -- Gianfranco Costamagna Wed, 31 Jan 2024 10:36:07 +0100 llvm-toolchain-18 (1:18.1.0-rc1-1~exp1) experimental; urgency=medium From aa3c31fb57ac42d2e95bc1d100dc9e7145ada8b8 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 5 Feb 2024 07:59:33 +0100 Subject: [PATCH 115/302] Use ABI time64 to avoid a transition for a new package --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index a7240e81..200a469e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,8 @@ PROJECTS = clang;clang-tools-extra;lld;cross-project-tests;mlir # openmp & libunwind aren't enabled for every platform RUNTIMES = compiler-rt;libcxx;libcxxabi +export DEB_BUILD_MAINT_OPTIONS=abi=+time64 + TARGET_BUILD := build-llvm TARGET_BUILD_STAGE2 := $(TARGET_BUILD)/tools/clang/stage2-bins DEB_INST := $(CURDIR)/debian/tmp/ From c00516863f0712654a87425d241f3ebc1a3641b0 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 5 Feb 2024 08:29:58 +0100 Subject: [PATCH 116/302] Update changelog and comment the change in rules file --- debian/changelog | 7 +++++++ debian/rules | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 61eb37a8..3501c8c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.0~rc1-2) unstable; urgency=medium + + [ Steve Langasek ] + * Use ABI time64 to avoid a transition for a new package + + -- Gianfranco Costamagna Mon, 05 Feb 2024 08:26:26 +0100 + llvm-toolchain-18 (1:18.1.0~rc1-1) unstable; urgency=medium [ Samuel Thibault ] diff --git a/debian/rules b/debian/rules index 200a469e..b71f437d 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ PROJECTS = clang;clang-tools-extra;lld;cross-project-tests;mlir # openmp & libunwind aren't enabled for every platform RUNTIMES = compiler-rt;libcxx;libcxxabi +# remove once the time64_t transition starts export DEB_BUILD_MAINT_OPTIONS=abi=+time64 TARGET_BUILD := build-llvm From b6fd55186806877495c6f073f8ed3a9ebb076c17 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 7 Feb 2024 15:02:30 +0100 Subject: [PATCH 117/302] Switch testing to 18 line --- debian/tests/cmake-clang-test | 2 +- debian/tests/cmake-llvm-test | 2 +- debian/tests/control | 10 +++++----- debian/tests/integration-test-suite-test | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/tests/cmake-clang-test b/debian/tests/cmake-clang-test index 89aa8e55..66ea9dff 100755 --- a/debian/tests/cmake-clang-test +++ b/debian/tests/cmake-clang-test @@ -2,7 +2,7 @@ set -e -LLVM_VERSION=17 +LLVM_VERSION=18 # 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 abaee6a2..a3ae4656 100755 --- a/debian/tests/cmake-llvm-test +++ b/debian/tests/cmake-llvm-test @@ -2,7 +2,7 @@ set -e -LLVM_VERSION=17 +LLVM_VERSION=18 # 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 1e3e72a6..97fdb374 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,7 +2,7 @@ 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-17-dbgsym, libclang1-17-dbgsym +# clang-18-dbgsym, libclang1-18-dbgsym Restrictions: allow-stderr Architecture: amd64 arm64 i386 @@ -12,13 +12,13 @@ Restrictions: allow-stderr Architecture: amd64 arm64 Tests: cmake-llvm-test -Depends: gcc, build-essential, cmake, llvm-17-dev +Depends: gcc, build-essential, cmake, llvm-18-dev Tests: cmake-clang-test -Depends: gcc, build-essential, cmake, llvm-17-dev, clang-17, libclang-17-dev +Depends: gcc, build-essential, cmake, llvm-18-dev, clang-18, libclang-18-dev Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)" -Depends: python3-lldb-17 +Depends: python3-lldb-18 Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)" -Depends: python3-clang-17 +Depends: python3-clang-18 diff --git a/debian/tests/integration-test-suite-test b/debian/tests/integration-test-suite-test index b3bd0a6e..3524400b 100755 --- a/debian/tests/integration-test-suite-test +++ b/debian/tests/integration-test-suite-test @@ -2,7 +2,7 @@ set -e -LLVM_VERSION=17 +LLVM_VERSION=18 # this is taken from libjsoncpp package # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we From e973cca72f1bbc0c977da0130bf5304e5e387a4f Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 7 Feb 2024 15:03:54 +0100 Subject: [PATCH 118/302] Fix an underlinking on qualify-clang.sh --- 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 9d2e4197..1cf5da58 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1395,7 +1395,7 @@ int main() { EmitBackendOutput(*diags, *hsOpts, *cgOpts, *tOpts, *lOpts, *tDesc, m, *action, VFS, std::move(AsmOutStream)); } EOF -clang++-$VERSION foo.cpp -o test -lclangBasic -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangCodeGen -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangFrontend -lclangDriver -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -lclangBasic -ldl /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -ldl -I /usr/lib/llvm-$VERSION/include/ -L/usr/lib/llvm-$VERSION/lib/ -lPolly -lPollyISL +clang++-$VERSION foo.cpp -o test -lclangBasic -lclangCodeGen -lclangDriver -lclangFrontend -lclangAPINotes -lclangFrontendTool -lclangCodeGen -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangFrontend -lclangDriver -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -lclangBasic -ldl /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -ldl -I /usr/lib/llvm-$VERSION/include/ -L/usr/lib/llvm-$VERSION/lib/ -lPolly -lPollyISL if test ! -f /usr/bin/lldb-$VERSION; then echo "Install lldb-$VERSION"; From a9eb2f405194cf020c891dfd69705e67950a00d9 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 7 Feb 2024 15:04:05 +0100 Subject: [PATCH 119/302] Fix time64 regex in the right place --- debian/rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index b71f437d..d56e00dd 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,6 @@ PROJECTS = clang;clang-tools-extra;lld;cross-project-tests;mlir # openmp & libunwind aren't enabled for every platform RUNTIMES = compiler-rt;libcxx;libcxxabi -# remove once the time64_t transition starts -export DEB_BUILD_MAINT_OPTIONS=abi=+time64 - TARGET_BUILD := build-llvm TARGET_BUILD_STAGE2 := $(TARGET_BUILD)/tools/clang/stage2-bins DEB_INST := $(CURDIR)/debian/tmp/ @@ -68,7 +65,9 @@ CONFIGURE_EXTRA = # dpkg-buildflags support # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto -export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto +# remove once the time64_t transition starts +export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto abi=+time64 + # these are handled on a per stage / build basis ifeq ($(VENDOR)-$(DEB_HOST_ARCH),Ubuntu-ppc64el) export DEB_CFLAGS_MAINT_STRIP = -g -O3 From 091616a2c54d495b20040432a011ecf0c363a42a Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 7 Feb 2024 15:07:47 +0100 Subject: [PATCH 120/302] Prepare-new-release is now updated for llvm-19 --- debian/prepare-new-release.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 From 930c1c116efe84ac7de193df7e794d8dfd6a70d0 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 7 Feb 2024 16:05:32 +0100 Subject: [PATCH 121/302] Fix another underlinking in qualify-clang.sh --- 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 1cf5da58..fe997fa8 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1395,7 +1395,7 @@ int main() { EmitBackendOutput(*diags, *hsOpts, *cgOpts, *tOpts, *lOpts, *tDesc, m, *action, VFS, std::move(AsmOutStream)); } EOF -clang++-$VERSION foo.cpp -o test -lclangBasic -lclangCodeGen -lclangDriver -lclangFrontend -lclangAPINotes -lclangFrontendTool -lclangCodeGen -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangFrontend -lclangDriver -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -lclangBasic -ldl /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -ldl -I /usr/lib/llvm-$VERSION/include/ -L/usr/lib/llvm-$VERSION/lib/ -lPolly -lPollyISL +clang++-$VERSION foo.cpp -o test -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangCodeGen -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangFrontend -lclangDriver -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -lclangAPINotes -lclangSupport -lclangBasic -ldl /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -ldl -I /usr/lib/llvm-$VERSION/include/ -L/usr/lib/llvm-$VERSION/lib/ -lPolly -lPollyISL if test ! -f /usr/bin/lldb-$VERSION; then echo "Install lldb-$VERSION"; From 5c457ebd2606cdc0a1591b87f132149add158632 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 7 Feb 2024 16:06:08 +0100 Subject: [PATCH 122/302] Fix tests by adding a .1 to clang and llvm versions --- debian/qualify-clang.sh | 2 +- debian/tests/cmake-clang-test | 2 +- debian/tests/cmake-llvm-test | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index fe997fa8..aa9f5e2f 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1521,7 +1521,7 @@ rm -rf cmaketest && mkdir cmaketest cat > cmaketest/CMakeLists.txt < CMakeLists.txt cmake_minimum_required(VERSION 3.22) project(cmake-clang-test) -find_package(Clang) +find_package(Clang $LLVM_VERSION.1 REQUIRED) EOF diff --git a/debian/tests/cmake-llvm-test b/debian/tests/cmake-llvm-test index a3ae4656..28d95b32 100755 --- a/debian/tests/cmake-llvm-test +++ b/debian/tests/cmake-llvm-test @@ -20,7 +20,7 @@ cd "$AUTOPKGTEST_TMP" cat < CMakeLists.txt cmake_minimum_required(VERSION 3.22) project(cmake-llvm-test) -find_package(LLVM $LLVM_VERSION REQUIRED +find_package(LLVM $LLVM_VERSION.1 REQUIRED COMPONENTS Analysis BitReader From d368a36668e0f6c9e25302a73656ecbff17b83a3 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 7 Feb 2024 16:06:29 +0100 Subject: [PATCH 123/302] Upload to sid --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3501c8c2..3d50fc36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +llvm-toolchain-18 (1:18.1.0~rc1-3) unstable; urgency=medium + + * Fix previus upload, time64 is effective only in one specific place of + rules file + * Fix some test using still clang-17 + * Switch testing to 18 line + * Fix an underlinking on qualify-clang.sh + + -- Gianfranco Costamagna Wed, 07 Feb 2024 15:05:08 +0100 + llvm-toolchain-18 (1:18.1.0~rc1-2) unstable; urgency=medium [ Steve Langasek ] From 32fad6b16bbc2783c3949402e2ec57bf7c1f2955 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 7 Feb 2024 17:23:10 +0100 Subject: [PATCH 124/302] new upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3d50fc36..ecbb452a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.0~rc2-1) unstable; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Wed, 07 Feb 2024 13:04:26 +0100 + llvm-toolchain-18 (1:18.1.0~rc1-3) unstable; urgency=medium * Fix previus upload, time64 is effective only in one specific place of From ce9199b0a73f0100b7d7b3278a1a26164aae0478 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 7 Feb 2024 21:15:59 +0100 Subject: [PATCH 125/302] fix the hour --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ecbb452a..e55fe5bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ llvm-toolchain-18 (1:18.1.0~rc2-1) unstable; urgency=medium * New snapshot release - -- Sylvestre Ledru Wed, 07 Feb 2024 13:04:26 +0100 + -- Sylvestre Ledru Wed, 07 Feb 2024 21:15:53 +0100 llvm-toolchain-18 (1:18.1.0~rc1-3) unstable; urgency=medium From 1d07bd10e29ba5368b996202a65e84edfab7f0bf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Jan 2024 12:00:51 +0100 Subject: [PATCH 126/302] add new symbols in libomp5 --- debian/libomp5-X.Y.symbols.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in index ed02c9d8..523fe7ce 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 18 + __tgt_rtl_get_global@VERS1.0 18 __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 18 __tgt_rtl_launch_kernel@VERS1.0 17 __tgt_rtl_load_binary@VERS1.0 17 __tgt_rtl_number_of_devices@VERS1.0 17 @@ -1382,6 +1385,7 @@ libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __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 18 __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 18 + __tgt_rtl_get_global@VERS1.0 18 __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 18 __tgt_rtl_launch_kernel@VERS1.0 17 __tgt_rtl_load_binary@VERS1.0 17 __tgt_rtl_number_of_devices@VERS1.0 17 @@ -1417,6 +1424,7 @@ libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __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 18 __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 18 + __tgt_rtl_get_global@VERS1.0 18 __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 18 __tgt_rtl_launch_kernel@VERS1.0 17 __tgt_rtl_load_binary@VERS1.0 17 __tgt_rtl_number_of_devices@VERS1.0 17 @@ -1452,6 +1463,7 @@ libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# __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 18 __tgt_rtl_wait_event@VERS1.0 17 libomptarget.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# VERS1.0@VERS1.0 17 From de773831ffbbe1507c1018e2b67c45712b797ef7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 8 Feb 2024 09:14:36 +0100 Subject: [PATCH 127/302] update of the changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e55fe5bd..3e5d7323 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.0~rc2-2) unstable; urgency=medium + + * add new symbols in libomp5 + + -- Sylvestre Ledru Fri, 26 Jan 2024 12:02:45 +0100 + llvm-toolchain-18 (1:18.1.0~rc2-1) unstable; urgency=medium * New snapshot release From 677b521d81169736b4601ad417153d102948b9df Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 8 Feb 2024 16:38:25 +0100 Subject: [PATCH 128/302] Also add lfs to fix 32bit build failures --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index d56e00dd..8c999b10 100755 --- a/debian/rules +++ b/debian/rules @@ -65,8 +65,8 @@ CONFIGURE_EXTRA = # dpkg-buildflags support # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto -# remove once the time64_t transition starts -export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto abi=+time64 +# remove +time64,+lfs once the time64_t transition starts +export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto abi=+time64,+lfs # these are handled on a per stage / build basis ifeq ($(VENDOR)-$(DEB_HOST_ARCH),Ubuntu-ppc64el) From 180dae8259f0d1ccb23678e2152c5dac480358d6 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 8 Feb 2024 16:38:55 +0100 Subject: [PATCH 129/302] Update changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3e5d7323..73528bc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium + + * Add also lfs on top of time64, to fix FTBFS on 32bit + + -- Gianfranco Costamagna Thu, 08 Feb 2024 16:38:35 +0100 + llvm-toolchain-18 (1:18.1.0~rc2-2) unstable; urgency=medium * add new symbols in libomp5 From d49a6f36a73513f1968452e9e86d5364f19542fc Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 8 Feb 2024 19:11:26 +0100 Subject: [PATCH 130/302] Try gold linker on mips64el --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 73528bc9..7797c4a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium + * Try gold linker on mips64el * Add also lfs on top of time64, to fix FTBFS on 32bit -- Gianfranco Costamagna Thu, 08 Feb 2024 16:38:35 +0100 diff --git a/debian/rules b/debian/rules index 8c999b10..58e43f5c 100755 --- a/debian/rules +++ b/debian/rules @@ -294,7 +294,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 kfreebsd-amd64 kfreebsd-i386 mips64el 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 ae1fec8b42c41672fb3a758eee366c6e16b86db7 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 9 Feb 2024 08:14:19 +0100 Subject: [PATCH 131/302] Merge changelogs --- debian/changelog | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7797c4a1..887297ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,13 @@ -llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium +llvm-toolchain-18 (1:18.1.0~rc2-2) unstable; urgency=medium + [ Gianfranco Costamagna ] * Try gold linker on mips64el * Add also lfs on top of time64, to fix FTBFS on 32bit - -- Gianfranco Costamagna Thu, 08 Feb 2024 16:38:35 +0100 - -llvm-toolchain-18 (1:18.1.0~rc2-2) unstable; urgency=medium - + [ Sylvestre Ledru ] * add new symbols in libomp5 - -- Sylvestre Ledru Fri, 26 Jan 2024 12:02:45 +0100 + -- Gianfranco Costamagna Thu, 08 Feb 2024 16:38:35 +0100 llvm-toolchain-18 (1:18.1.0~rc2-1) unstable; urgency=medium From ef3fcf56a13de794b72856b57f7f2cdaeea05028 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 9 Feb 2024 12:38:36 +0100 Subject: [PATCH 132/302] s390x sccache: increase cache size to 20G --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 58e43f5c..2d1f78e4 100755 --- a/debian/rules +++ b/debian/rules @@ -727,7 +727,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server else # on s390x machine, use a local cache - SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true $(SCCACHE_CMD) --start-server + SCCACHE_CACHE_SIZE=20G SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true $(SCCACHE_CMD) --start-server endif endif echo "Running tests: $(RUN_TEST)" From 1bce57bd9da0f1e2b420b9ed3f47bc894800ffc5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 9 Feb 2024 12:38:41 +0100 Subject: [PATCH 133/302] remove a useless tab --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 2d1f78e4..00a2432a 100755 --- a/debian/rules +++ b/debian/rules @@ -724,7 +724,7 @@ ifeq (${SCCACHE_ENABLE},yes) $(SCCACHE_CMD) --stop-server||true ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) # Start the sccache server with the right set of options to use GCP - SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server + SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server else # on s390x machine, use a local cache SCCACHE_CACHE_SIZE=20G SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true $(SCCACHE_CMD) --start-server From 74834881c5f12d0d17fc9b47aa1c75495c0b7a8e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 11 Feb 2024 14:29:38 +0100 Subject: [PATCH 134/302] Add abi=+time64,+lfs only on 64bits system --- debian/changelog | 6 ++++++ debian/rules | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 887297ec..3109171d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium + + * Add abi=+time64,+lfs only on 64bits system + + -- Sylvestre Ledru Sun, 11 Feb 2024 14:29:31 +0100 + llvm-toolchain-18 (1:18.1.0~rc2-2) unstable; urgency=medium [ Gianfranco Costamagna ] diff --git a/debian/rules b/debian/rules index 00a2432a..7f060988 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,12 @@ 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 abi=+time64,+lfs +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) From 2a5c838b138e6bc683dec585e3daea61e66e4da1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 11 Feb 2024 14:44:43 +0100 Subject: [PATCH 135/302] show DEB_BUILD_MAINT_OPTIONS too --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 7f060988..9948e467 100755 --- a/debian/rules +++ b/debian/rules @@ -587,6 +587,7 @@ stamps/preconfigure: @echo "DEB_HOST_ARCH_BITS=$(DEB_HOST_ARCH_BITS)" @echo "DEB_HOST_ARCH=$(DEB_HOST_ARCH)" @echo "DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS)" + @echo "DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS)" @echo "DISTRO=$(DISTRO)" @echo "GCC_VERSION=$(GCC_VERSION)" @echo "PROJECTS=$(PROJECTS_LIST)" From 34affc37681f612ef8e33b3254cb0bf667cea724 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 16 Feb 2024 09:54:15 +0100 Subject: [PATCH 136/302] Install *clang_rt* on sparc and sparc64 --- debian/changelog | 7 +++++++ debian/libclang-rt-X.Y-dev.install.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3109171d..04173f79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Install *clang_rt* on sparc and sparc64 + + -- John Paul Adrian Glaubitz Fri, 16 Feb 2024 09:53:15 +0100 + llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium * Add abi=+time64,+lfs only on 64bits system 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 88f4607443718947014f1553df6d367ea9b25ea3 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 16 Feb 2024 09:55:07 +0100 Subject: [PATCH 137/302] 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 04173f79..6f1015ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 + * Run chrpath for libclang on sparc and sparc64 -- John Paul Adrian Glaubitz Fri, 16 Feb 2024 09:53:15 +0100 diff --git a/debian/rules b/debian/rules index 9948e467..a5820140 100755 --- a/debian/rules +++ b/debian/rules @@ -1132,7 +1132,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 4df76dc5b4bb483bd90d944c592b4ac234b19c84 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 18 Feb 2024 22:34:01 +0100 Subject: [PATCH 138/302] add -DLIBCXX_INSTALL_MODULES=ON see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 --- debian/changelog | 6 +++++- debian/rules | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6f1015ea..720513c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,11 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium * Install *clang_rt* on sparc and sparc64 * Run chrpath for libclang on sparc and sparc64 - -- John Paul Adrian Glaubitz Fri, 16 Feb 2024 09:53:15 +0100 + [ Sylvestre Ledru ] + * add -DLIBCXX_INSTALL_MODULES=ON + see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 + + -- Sylvestre Ledru Sun, 18 Feb 2024 22:32:30 +0100 llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index a5820140..89269eb6 100755 --- a/debian/rules +++ b/debian/rules @@ -781,6 +781,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 397c393faf92aee56c2d6f004a5078ccd283d040 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 19 Feb 2024 16:22:25 +0100 Subject: [PATCH 139/302] 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 | 6 ++++-- debian/libc++-X.Y-dev.install.in | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 720513c7..8f7de8f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.0~rc2-5) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 @@ -7,8 +7,10 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium [ 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 - -- Sylvestre Ledru Sun, 18 Feb 2024 22:32:30 +0100 + -- Sylvestre Ledru Mon, 19 Feb 2024 16:21:34 +0100 llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium 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 9cd963c144f865a07f88f286d3c9c6c538879b39 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 19 Feb 2024 16:22:25 +0100 Subject: [PATCH 140/302] 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 | 10 ++++++++++ debian/libc++-X.Y-dev.install.in | 9 ++++++--- debian/libllvmlibc-X.Y-dev.install.in | 1 + debian/rules | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 debian/libllvmlibc-X.Y-dev.install.in diff --git a/debian/changelog b/debian/changelog index 8f7de8f4..e36c84d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-18 (1:18.1.0~rc2-5) UNRELEASED; urgency=medium +<<<<<<< [ John Paul Adrian Glaubitz ] * Install *clang_rt* on sparc and sparc64 * Run chrpath for libclang on sparc and sparc64 @@ -9,6 +10,15 @@ llvm-toolchain-18 (1:18.1.0~rc2-5) UNRELEASED; urgency=medium 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 +>>>>>>> -- Sylvestre Ledru Mon, 19 Feb 2024 16:21:34 +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 89269eb6..6f4f3fe7 100755 --- a/debian/rules +++ b/debian/rules @@ -782,6 +782,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 989a63a68eeaf451897a35b6c9166980f70609fc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Feb 2024 22:40:44 +0100 Subject: [PATCH 141/302] fix changelog --- debian/changelog | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index e36c84d1..f780270a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,5 @@ -llvm-toolchain-18 (1:18.1.0~rc2-5) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; urgency=medium -<<<<<<< - [ 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 @@ -18,7 +7,6 @@ llvm-toolchain-18 (1:18.1.0~rc2-5) UNRELEASED; 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 ->>>>>>> -- Sylvestre Ledru Mon, 19 Feb 2024 16:21:34 +0100 From 8ab71b62cfbd77e0b0aa93b60d79fa04777496c8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Feb 2024 22:42:46 +0100 Subject: [PATCH 142/302] Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now) --- debian/changelog | 1 + debian/control | 10 ++++++++++ debian/control.in | 10 ++++++++++ debian/rules | 7 +++++-- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f780270a..f3a10a2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; 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 + * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now) -- Sylvestre Ledru Mon, 19 Feb 2024 16:21:34 +0100 diff --git a/debian/control b/debian/control index f6cdae61..24e736c9 100644 --- a/debian/control +++ b/debian/control @@ -952,3 +952,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 d47e0cc4..b785ad23 100644 --- a/debian/control.in +++ b/debian/control.in @@ -952,3 +952,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 6f4f3fe7..9adb73af 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ # 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 +RUNTIMES = compiler-rt;libcxx;libcxxabi;libc TARGET_BUILD := build-llvm TARGET_BUILD_STAGE2 := $(TARGET_BUILD)/tools/clang/stage2-bins @@ -553,7 +553,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) @@ -1473,6 +1473,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 a656221b33a1cc58c972dc282908f83c96aa7834 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Feb 2024 09:20:50 +0100 Subject: [PATCH 143/302] 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 9948e467..f884626c 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 1a18aa1aa6e9fc698868fd22a99ea875f3efb20a Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Feb 2024 14:10:45 +0100 Subject: [PATCH 144/302] Add code to hack time64 in 32bit builds, and try to disable stack protector on mips64el --- debian/changelog | 7 +++++++ debian/control | 14 +++++++++----- debian/control.in | 14 +++++++++----- debian/rules | 41 +++++++++++++++++++++++++++-------------- 4 files changed, 52 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3109171d..f2ad6bf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 + + -- Gianfranco Costamagna Fri, 09 Feb 2024 20:59:07 +0100 + llvm-toolchain-18 (1:18.1.0~rc2-3) unstable; urgency=medium * Add abi=+time64,+lfs only on 64bits system diff --git a/debian/control b/debian/control index f6cdae61..9a2d05f1 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-18 +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-cpp18 +Provides: ${t64:Provides} Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}) @@ -338,6 +340,7 @@ Description: Clang examples # ------------- LLVM ------------- Package: libllvm18 +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-18 +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}, libllvm18 (= ${binary:Version}) @@ -634,7 +638,7 @@ Package: libomp5-18 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 f884626c..f17d6299 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 @@ -1135,7 +1145,7 @@ override_dh_auto_install: ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64)) 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 @@ -1397,7 +1407,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))) @@ -1525,8 +1535,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 b8b0648991a95e1ee1b277c4f5dd7551548befb8 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Feb 2024 14:11:36 +0100 Subject: [PATCH 145/302] Update changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index f2ad6bf6..538ac1bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,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 5b6b66c4c7e88ec41a12d2f2d6f784d81d8a5203 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Feb 2024 17:58:25 +0100 Subject: [PATCH 146/302] Refresh timestamp for changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 538ac1bc..6cad6a7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium * 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 3071f6c49c5f51db03e5e6f7d79cf3bfbcfa2bcc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 23 Feb 2024 09:01:00 +0100 Subject: [PATCH 147/302] rebase of the patches --- debian/patches/0044-soname.diff | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 4ef51f2b..8b819677 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-18_18.1.0~++20240223085437+b9029ed0053b/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-18_18.1.0~++20240223085437+b9029ed0053b.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b/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-18_18.1.0~++20240223085437+b9029ed0053b/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-18_18.1.0~++20240223085437+b9029ed0053b.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b/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}) - From d4d38faa71ac072738684b9b7574511de9f98abf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Feb 2024 23:06:24 +0100 Subject: [PATCH 148/302] 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 a80bdfc5635e8dce6d2a451d32a5c0e39a4c646f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 27 Feb 2024 08:45:30 +0100 Subject: [PATCH 149/302] New snapshot release (amd64, arm64 and armhf) --- debian/changelog | 6 ++++-- debian/control.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd2ffd90..1887684b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,17 @@ -llvm-toolchain-18 (1:18.1.0~rc2-5) UNRELEASED; urgency=medium +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 Mon, 19 Feb 2024 16:21:34 +0100 + -- Sylvestre Ledru Tue, 27 Feb 2024 08:43:07 +0100 llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium 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 dad9d0d187b82bb12c2a33c857c62af7ff88e4e7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 27 Feb 2024 13:39:07 +0100 Subject: [PATCH 150/302] 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 ac49168e..7739078a 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 b42ff9916eddde26eb505d6f76e51d02d4c0d267 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 27 Feb 2024 14:06:38 +0100 Subject: [PATCH 151/302] only enable libc on 3 archs --- debian/rules | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index b298f9e3..f26330ce 100755 --- a/debian/rules +++ b/debian/rules @@ -25,15 +25,15 @@ LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$N # 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;libc + 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;libc + 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;libc + RUNTIMES = compiler-rt;libcxx;libcxxabi ifeq ($(DEB_HOST_ARCH),mips64el) export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong else @@ -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 dfa704d6fe8a9a85fd81d8a96cf5e51a3b9f4e1a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 28 Feb 2024 11:08:49 +0100 Subject: [PATCH 152/302] rc4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1887684b..5a2d5612 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -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 @@ -11,7 +11,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 72f45797b9e2001f97f85cc40372ca6881d5098a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 28 Feb 2024 11:12:03 +0100 Subject: [PATCH 153/302] rebase of all patches --- debian/patches/0044-soname.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 8b819677..689e95c4 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-18_18.1.0~++20240223085437+b9029ed0053b/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-18_18.1.0-rc4/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b/clang/tools/libclang/CMakeLists.txt +--- llvm-toolchain-18_18.1.0-rc4.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-18_18.1.0-rc4/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-18_18.1.0~++20240223085437+b9029ed0053b/clang/tools/libcla OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-18_18.1.0-rc4/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-18_18.1.0~++20240223085437+b9029ed0053b/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_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 + From 67cd1db5ecd748eb80194c54262cd6c04c06c3b2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 1 Mar 2024 16:09:06 +0100 Subject: [PATCH 154/302] fix the activation of libc --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f26330ce..6320028c 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 4b46fbf04759d536e7f7dc9576a053171767831a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 21 Feb 2024 10:43:08 +0100 Subject: [PATCH 155/302] 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 3271139eeb567c8a97117da329cc69a694f8fbe1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 1 Mar 2024 21:58:11 +0100 Subject: [PATCH 156/302] adjust the version minor --- debian/libclang-cppX.Y.install.in | 2 +- debian/libomp5-X.Y.install.in | 2 +- debian/llvm-X.Y-linker-tools.install.in | 2 +- debian/rules | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Y.install.in index 5874c10d..120529f4 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@.0 +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Y.install.in index a0fcf107..5d3baecd 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@.0 +[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in index a073ccab..b9bb2552 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@.0 +usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ [!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so diff --git a/debian/rules b/debian/rules index 6320028c..2f9ef74c 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,7 @@ GCC_VERSION := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE)) 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]+\.(.*)\..*,\1,p") 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 @@ -607,6 +608,7 @@ stamps/preconfigure: @echo "PROJECTS=$(PROJECTS_LIST)" @echo "RUNTIMES=$(RUNTIMES_LIST)" @echo "LLVM_VERSION=$(LLVM_VERSION)" + @echo "LLVM_VERSION_MINOR=$(LLVM_VERSION_MINOR)" @echo "LLVM_VERSION_FULL=$(LLVM_VERSION_FULL)" @echo "LLVM_VERSION_SNAPSHOT=$(LLVM_VERSION_SNAPSHOT)" @echo "PATH=$(PATH)" @@ -631,6 +633,7 @@ stamps/preconfigure: -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ -e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \ + -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; \ done From a1442f1a02b047998847bb99b923347a19bd02e5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 22 Feb 2024 12:23:00 +0100 Subject: [PATCH 157/302] Also install usr/lib/llvm-18/lib/libLLVM.so.1 and usr/lib/llvm-18/lib/libLLVM.so.18.1 --- debian/changelog | 2 ++ debian/libllvmX.Y.install.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5a2d5612..b3dc08d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ 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) + * 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 diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index c5215640..11f472d2 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.@LLVM_VERSION_MINOR@ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ From c5dd54428d0cce988a60a4430682a4396da687c8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Mar 2024 17:19:43 +0100 Subject: [PATCH 158/302] fix the version detection --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 2f9ef74c..f5876b0c 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ GCC_VERSION := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE)) 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]+\.(.*)\..*,\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") ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL)) LLVM_VERSION_FULL := $(LLVM_VERSION).0.0 From e5997f0f1a57601b89e481210ffff71e8866172e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 23 Feb 2024 08:47:29 +0100 Subject: [PATCH 159/302] Export mxgot on mips64el --- debian/rules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index f5876b0c..b40b4b70 100755 --- a/debian/rules +++ b/debian/rules @@ -36,9 +36,11 @@ else else RUNTIMES = compiler-rt;libcxx;libcxxabi ifeq ($(DEB_HOST_ARCH),mips64el) - export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong + export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong + CFLAGS_EXTRA += -mxgot + CXXFLAGS_EXTRA += -mxgot else - export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto + export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto endif endif endif From 84f08a657caa9ee1604dbb6cc2044847ef265db6 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 3 Mar 2024 11:52:09 +0100 Subject: [PATCH 160/302] Simplify rules file now that time64_t transition has started --- debian/rules | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index b40b4b70..6b45c87f 100755 --- a/debian/rules +++ b/debian/rules @@ -24,14 +24,12 @@ LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$N # 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_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 @@ -39,8 +37,6 @@ else export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong CFLAGS_EXTRA += -mxgot CXXFLAGS_EXTRA += -mxgot - else - export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto endif endif endif From 9fa6fc4dc691d51dd502433c3db2758050269b55 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 3 Mar 2024 15:08:18 +0100 Subject: [PATCH 161/302] Use stack-protector on mips64el --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index 6b45c87f..6a11d913 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,6 @@ else else RUNTIMES = compiler-rt;libcxx;libcxxabi ifeq ($(DEB_HOST_ARCH),mips64el) - export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto hardening=-stackprotector,-stackprotectorstrong CFLAGS_EXTRA += -mxgot CXXFLAGS_EXTRA += -mxgot endif From 34cd34bbfcbae6021c8a7b0fdc161ef48cb13dd3 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 4 Mar 2024 09:07:59 +0100 Subject: [PATCH 162/302] Fix mxgot export on mips64el --- debian/rules | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 6a11d913..28fcc9f7 100755 --- a/debian/rules +++ b/debian/rules @@ -33,10 +33,6 @@ else skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev else RUNTIMES = compiler-rt;libcxx;libcxxabi - ifeq ($(DEB_HOST_ARCH),mips64el) - CFLAGS_EXTRA += -mxgot - CXXFLAGS_EXTRA += -mxgot - endif endif endif @@ -219,6 +215,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)) From 9fe6ae31e2a30fa27d732154f09f216eaa98f39f Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 5 Mar 2024 10:18:06 +0100 Subject: [PATCH 163/302] Disable tests on mips64el --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 28fcc9f7..21516852 100755 --- a/debian/rules +++ b/debian/rules @@ -386,8 +386,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 mips64el +ifeq (mips64el,$(DEB_HOST_ARCH)) RUN_TEST=no endif From 7f41bce4f05f6ab518d94d5c2a1d8f35e7cb2c45 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Mar 2024 19:08:51 +0100 Subject: [PATCH 164/302] Disable libllvmlibc-18-dev on armhf (Closes: #1065503) --- 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 b3dc08d2..8f9eec53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.0~rc4-2) UNRELEASED; urgency=medium + + * Disable libllvmlibc-18-dev on armhf (Closes: #1065503) + + -- Sylvestre Ledru Tue, 05 Mar 2024 19:08:29 +0100 + llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium [ John Paul Adrian Glaubitz ] diff --git a/debian/control b/debian/control index 7739078a..903663b6 100644 --- a/debian/control +++ b/debian/control @@ -961,7 +961,7 @@ Description: Flang library - Development package Package: libllvmlibc-18-dev Section: libdevel -Architecture: amd64 arm64 armhf +Architecture: amd64 arm64 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 4941bb0b..f6de7a06 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 Description: LLVM C Library - dev package Implementation of the C standard library targeting C17 and above. . From e09de8fa039ca518758e092fa9026ccd3481f613 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 5 Mar 2024 23:35:52 +0100 Subject: [PATCH 165/302] * Make libclang-common-18-dev architecture dependent. --- debian/changelog | 6 +++++- debian/control | 12 ++++++------ debian/control.in | 12 ++++++------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8f9eec53..82f68c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-18 (1:18.1.0~rc4-2) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * Disable libllvmlibc-18-dev on armhf (Closes: #1065503) - -- Sylvestre Ledru Tue, 05 Mar 2024 19:08:29 +0100 + [ Matthias Klose ] + * Make libclang-common-18-dev architecture dependent. + + -- Sylvestre Ledru Tue, 05 Mar 2024 23:31:06 +0100 llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 903663b6..830b4ec6 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libllvm18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}), + libclang-common-18-dev (= ${binary:Version}), llvm-18-linker-tools (= ${binary:Version}), libclang1-18 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler @@ -96,7 +96,7 @@ Package: clang-tidy-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libllvm18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}), + libclang-common-18-dev (= ${binary:Version}), clang-tools-18, python3-yaml Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming @@ -108,7 +108,7 @@ Package: clangd-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}), + libclang-common-18-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-18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}) + libclang-common-18-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-18. Package: libclang-common-18-dev -Architecture: all -Multi-Arch: foreign +Architecture: any +Multi-Arch: same Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: libclang-rt-18-dev diff --git a/debian/control.in b/debian/control.in index f6de7a06..741a421c 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 c78e2ba003606dcb779077ab185e3505f2ca6937 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 6 Mar 2024 07:27:22 +0100 Subject: [PATCH 166/302] Update changelog --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 82f68c42..43093d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,11 @@ llvm-toolchain-18 (1:18.1.0~rc4-2) UNRELEASED; urgency=medium [ Matthias Klose ] * Make libclang-common-18-dev architecture dependent. + [ Gianfranco Costamagna ] + * Simplify rules file now that time64_t is default. + * Use mxgot on mips64el + * Disable tests on mips64el, they do timeout + -- Sylvestre Ledru Tue, 05 Mar 2024 23:31:06 +0100 llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium From 264e74e25129f6ecee49a2bc5043c08fd4340008 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 6 Mar 2024 09:17:16 +0100 Subject: [PATCH 167/302] mark profile and xray include files as optional on armel and armhf. --- debian/changelog | 3 ++- debian/libclang-common-X.Y-dev.install.in | 6 ++++-- debian/rules | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 43093d9c..2d34017e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,8 @@ llvm-toolchain-18 (1:18.1.0~rc4-2) UNRELEASED; urgency=medium * Disable libllvmlibc-18-dev on armhf (Closes: #1065503) [ Matthias Klose ] - * Make libclang-common-18-dev architecture dependent. + * Make libclang-common-18-dev architecture dependent, mark profile and xray + include files as optional on armel and armhf. [ Gianfranco Costamagna ] * Simplify rules file now that time64_t is default. diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 89cfed01..a2725566 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 21516852..9e435c10 100755 --- a/debian/rules +++ b/debian/rules @@ -637,6 +637,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 b33212f2d3fbfb8a91efe48cfd21418118dbc1c9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 2 Mar 2024 23:32:19 +0100 Subject: [PATCH 168/302] enable thinlto --- debian/rules | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/debian/rules b/debian/rules index 9e435c10..e2d4422d 100755 --- a/debian/rules +++ b/debian/rules @@ -477,19 +477,11 @@ ifeq (,$(filter-out $(LLVM_ENABLE_ZSTD_DISABLE_DISTRO), $(DISTRO))) STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ZSTD=OFF endif -LTO_ENABLE=no -# Only enable it for archs supporting gold -ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) -# LTO requires a bunch of memory. Don't do it everywhere -LTO_DISABLE_ARCHS := i386 armhf s390x ppc64 x32 -ifeq (,$(filter-out $(LTO_DISABLE_ARCHS), $(DEB_HOST_ARCH))) - LTO_ENABLE=no -else -# Disable for now because of -# https://github.com/llvm/llvm-project/issues/58317#issuecomment-1276190743 -# LTO_ENABLE=yes -# STAGE_2_CMAKE_EXTRA += -DLLVM_ENABLE_LTO="On" -endif +THINLTO_ENABLE=no +THINLTO_ARCHS := amd64 arm64 +ifneq (,$(filter $(DEB_HOST_ARCH),$(THINLTO_ARCHS))) + BOOTSTRAP_CMAKE_EXTRA +=-DBOOTSTRAP_LLVM_ENABLE_LTO=Thin + THINLTO_ENABLE=yes endif # https://bugs.launchpad.net/bugs/2016471 @@ -612,7 +604,7 @@ stamps/preconfigure: @echo "STAGE_1_CXXFLAGS=$(STAGE_1_CXXFLAGS)" @echo "STAGE_2_CFLAGS=$(STAGE_2_CFLAGS)" @echo "LIBFUZZER_ENABLE=$(LIBFUZZER_ENABLE)" - @echo "LTO_ENABLE=$(LTO_ENABLE)" + @echo "THINLTO_ENABLE=$(THINLTO_ENABLE)" @echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)" @echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)" @echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)" @@ -1430,7 +1422,7 @@ endif rm -fr $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/wasi/ stamps/repack_a_llvm_ir: -ifeq (${LTO_ENABLE},yes) +ifeq (${THINLTO_ENABLE},yes) # with LTO, .a contains llvm ir instead of native code. So, recompile them NJOBS="$(NJOBS)" P_TO_LLVM="$(CURDIR)" VERSION=$(LLVM_VERSION) bash -v debian/llvm-compile-lto-elf.sh $(CXXFLAGS_EXTRA) endif From f6c22777bc0687fc548343d3fa565656a1318a18 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Mar 2024 09:22:34 +0100 Subject: [PATCH 169/302] adjust some symlinks --- debian/changelog | 11 ++++++----- debian/libclang-cppX.Y.install.in | 2 +- debian/libllvmX.Y.install.in | 5 ++--- debian/libllvmX.Y.links.in | 8 ++++---- debian/libomp5-X.Y.install.in | 2 +- debian/llvm-X.Y-dev.links.in | 7 ++----- debian/llvm-X.Y-linker-tools.install.in | 2 +- debian/qualify-clang.sh | 2 +- 8 files changed, 18 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d34017e..ec295660 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -llvm-toolchain-18 (1:18.1.0~rc4-2) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.0~rc4-2) unstable; urgency=medium [ Sylvestre Ledru ] * Disable libllvmlibc-18-dev on armhf (Closes: #1065503) + * Adjust some symlinks with the rc4 changes [ Matthias Klose ] * Make libclang-common-18-dev architecture dependent, mark profile and xray @@ -12,7 +13,7 @@ llvm-toolchain-18 (1:18.1.0~rc4-2) UNRELEASED; urgency=medium * Use mxgot on mips64el * Disable tests on mips64el, they do timeout - -- Sylvestre Ledru Tue, 05 Mar 2024 23:31:06 +0100 + -- Sylvestre Ledru Wed, 06 Mar 2024 09:21:57 +0100 llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium @@ -26,10 +27,10 @@ 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) - * Also install usr/lib/llvm-19/lib/libLLVM.so.1 - and usr/lib/llvm-19/lib/libLLVM.so.18.0 + * Also install usr/lib/llvm-18/lib/libLLVM.so.1 + and usr/lib/llvm-18/lib/libLLVM.so.18.0 - -- Sylvestre Ledru Wed, 28 Feb 2024 11:08:41 +0100 + -- Sylvestre Ledru Tue, 05 Mar 2024 23:05:07 +0100 llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Y.install.in index 120529f4..88ea883a 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@.@LLVM_VERSION_MINOR@ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.1 diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index 11f472d2..ebdeb0a0 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1,3 +1,2 @@ -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@.@LLVM_VERSION_MINOR@ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 067b0884..56a2420d 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,4 +1,4 @@ -# 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 - +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Y.install.in index 5d3baecd..3657fa80 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@.@LLVM_VERSION_MINOR@ +[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.1 diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index b3a2a2ae..90e99374 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -1,8 +1,5 @@ -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/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so 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 diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in index b9bb2552..68af500a 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@ +usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.1 [!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index c884e3c8..4e601995 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" check_symlink "libclang-$VERSION.so" check_symlink "libclang.so" From a403fa2c96f7373b176f1739a92a47d07036d6ec Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Mar 2024 23:20:25 +0100 Subject: [PATCH 170/302] update of the repack llvm ir => .a file --- debian/llvm-compile-lto-elf.sh | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/debian/llvm-compile-lto-elf.sh b/debian/llvm-compile-lto-elf.sh index d0ae0ca3..f652d980 100644 --- a/debian/llvm-compile-lto-elf.sh +++ b/debian/llvm-compile-lto-elf.sh @@ -25,18 +25,25 @@ NCPUS=$NJOBS check_convert_bitcode () { local file_name=$(realpath ${1}) local file_type=$(file ${file_name}) + shift CLANG_FLAGS="$@" if [[ "${file_type}" == *"LLVM IR bitcode"* ]]; then - # check for an indication that the bitcode was - # compiled with -flto - ${P_TO_LLVM}/debian/tmp/usr/bin/llvm-bcanalyzer-${VERSION} -dump ${file_name} | grep -xP '.*\-flto((?!-fno-lto).)*' 2>&1 > /dev/null - if [ $? -eq 0 ]; then - echo "Compiling LLVM bitcode file ${file_name}." - ${P_TO_LLVM}/debian/tmp/usr/bin/clang-${VERSION} -fno-lto -opaque-pointers -Wno-unused-command-line-argument \ - -x ir ${file_name} -c -o ${file_name} - fi + # Check the output of llvm-strings for the command line, which is in the LLVM bitcode because + # we pass -frecord-gcc-switches. + # Check for a line that has "-flto" after (or without) "-fno-lto". + llvm-strings ${file_name} | while read line ; do + flto=$(echo $line | grep -o -b -e -flto | tail -n 1 | cut -d : -f 1) + fnolto=$(echo $line | grep -o -b -e -fno-lto | tail -n 1 | cut -d : -f 1) + + if test -n "$flto" && { test -z "$fnolto" || test "$flto" -gt "$fnolto"; } ; then + echo "Compiling LLVM bitcode file ${file_name}." + clang ${CLANG_FLAGS} -fno-lto -Wno-unused-command-line-argument \ + -x ir ${file_name} -c -o ${file_name} + break + fi + done elif [[ "${file_type}" == *"current ar archive"* ]]; then echo "Unpacking ar archive ${file_name} to check for LLVM bitcode components." # create archive stage for objects @@ -47,7 +54,7 @@ check_convert_bitcode () { for archived_file in $(find -not -type d); do check_convert_bitcode ${archived_file} ${CLANG_FLAGS} echo "Repacking ${archived_file} into ${archive}." - ${P_TO_LLVM}/debian/tmp/usr/bin/llvm-ar-${VERSION} r ${archive} ${archived_file} + ar r ${archive} ${archived_file} done popd fi @@ -55,5 +62,7 @@ check_convert_bitcode () { echo "Checking for LLVM bitcode artifacts" export -f check_convert_bitcode -find "$P_TO_LLVM/debian/" -type f -name "*.[ao]" -print0 | \ - xargs -0 -r -n1 -P$NCPUS bash -c "check_convert_bitcode \$@ $CLANG_FLAGS" ARG0 +# Deduplicate by device:inode to avoid processing hardlinks in parallel. +find "$P_TO_LLVM/debian/" -type f -name "*.[ao]" -printf "%D:%i %p\n" | \ + awk '!seen[$1]++' | cut -d" " -f2- | \ + xargs -d"\n" -r -n1 -P$NCPUS sh -c "check_convert_bitcode \$@ $CLANG_FLAGS" ARG0 From cd5f1cce8988f41d05add38596ec84185a0dcf41 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Mar 2024 09:20:41 +0100 Subject: [PATCH 171/302] fix the call to the llvm ir => .a --- debian/llvm-compile-lto-elf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/llvm-compile-lto-elf.sh b/debian/llvm-compile-lto-elf.sh index f652d980..63a19e29 100644 --- a/debian/llvm-compile-lto-elf.sh +++ b/debian/llvm-compile-lto-elf.sh @@ -65,4 +65,4 @@ export -f check_convert_bitcode # Deduplicate by device:inode to avoid processing hardlinks in parallel. find "$P_TO_LLVM/debian/" -type f -name "*.[ao]" -printf "%D:%i %p\n" | \ awk '!seen[$1]++' | cut -d" " -f2- | \ - xargs -d"\n" -r -n1 -P$NCPUS sh -c "check_convert_bitcode \$@ $CLANG_FLAGS" ARG0 + xargs -d"\n" -r -n1 -P$NCPUS bash -c "check_convert_bitcode \$@ $CLANG_FLAGS" ARG0 From a5bf4aa0b284ec416a67ff460beb18789f92888e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Mar 2024 09:23:29 +0100 Subject: [PATCH 172/302] disable thinlto --- debian/rules | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index e2d4422d..8718033c 100755 --- a/debian/rules +++ b/debian/rules @@ -479,10 +479,11 @@ endif THINLTO_ENABLE=no THINLTO_ARCHS := amd64 arm64 -ifneq (,$(filter $(DEB_HOST_ARCH),$(THINLTO_ARCHS))) - BOOTSTRAP_CMAKE_EXTRA +=-DBOOTSTRAP_LLVM_ENABLE_LTO=Thin - THINLTO_ENABLE=yes -endif +# Needs more work, disabling for now +#ifneq (,$(filter $(DEB_HOST_ARCH),$(THINLTO_ARCHS))) +# BOOTSTRAP_CMAKE_EXTRA +=-DBOOTSTRAP_LLVM_ENABLE_LTO=Thin +# THINLTO_ENABLE=yes +#endif # https://bugs.launchpad.net/bugs/2016471 ifeq (,$(filter-out $(LTO_DISABLE_ARCHS), $(DEB_HOST_ARCH))) From 2c086230ae35460306459f661a21d7619fe4f00f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Mar 2024 11:08:09 +0100 Subject: [PATCH 173/302] adjust the qualify-clang.sh with the libclang-common update --- 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 4e601995..0dbe8c89 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 libllvmlibc-${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}_amd64.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-*'" From 66ad38e2893313b3c97dcbd5a256d78a4ff391cf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Mar 2024 11:21:40 +0100 Subject: [PATCH 174/302] add a test for C++ modules --- debian/changelog | 6 +++++ debian/qualify-clang.sh | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/debian/changelog b/debian/changelog index ec295660..dc7b18c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.0~rc4-3) unstable; urgency=medium + + * Add a test to verify C++ modules tests + + -- Sylvestre Ledru Wed, 06 Mar 2024 11:21:59 +0100 + llvm-toolchain-18 (1:18.1.0~rc4-2) unstable; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 0dbe8c89..cf5941bc 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1092,6 +1092,59 @@ g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -L/usr/lib/llvm- ./o > /dev/null fi +# Test C++ modules with the libc++ +cat << EOF > foo.cpp +import std; // When importing std.compat it's not needed to import std. +import std.compat; + +int main() { + std::cout << "Hello modular world\n"; + ::printf("Hello compat modular world\n"); +} +EOF + +# Builds the std module +clang-$VERSION -std=c++20 \ + -nostdinc++ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ + --precompile -o std.pcm \ + -c /usr/lib/llvm-$VERSION/share/libc++/v1/std.cppm + +# Builds the std.compat module +clang-$VERSION -std=c++20 \ + -nostdinc++ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ + --precompile -o std.compat.pcm \ + -fmodule-file=std=std.pcm \ + -c /usr/lib/llvm-$VERSION/share/libc++/v1/std.compat.cppm + +# Builds the test application +clang-$VERSION -std=c++20 \ + -nostdinc++ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -L /usr/lib/llvm-$VERSION/lib \ + -fmodule-file=std=std.pcm \ + -fmodule-file=std.compat=std.compat.pcm \ + std.pcm \ + std.compat.pcm \ + -lc++ \ + foo.cpp + +# Runs the test application +# The output should be +# Hello modular world +# Hello compat modular world +./a.out > foo.log +if ! grep -q -E "Hello modular world" foo.log 2>&1; then + echo "c++ modules didn't work" + exit 1 +fi +if ! grep -q -E "Hello compat modular world" foo.log 2>&1; then + echo "c++ modules didn't work" + exit 1 +fi if dpkg -l|grep -q flang-$VERSION; then echo "Testing flang-$VERSION (Fortran) ..." From 14e2367bc121d66d4c515a4bb599db61ac68b232 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Mar 2024 11:39:43 +0100 Subject: [PATCH 175/302] new release --- debian/changelog | 9 ++++----- debian/rules | 9 ++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc7b18c1..b00e9d73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -llvm-toolchain-18 (1:18.1.0~rc4-3) unstable; urgency=medium +llvm-toolchain-18 (1:18.1.0-1) unstable; urgency=medium + * New stable release * Add a test to verify C++ modules tests - -- Sylvestre Ledru Wed, 06 Mar 2024 11:21:59 +0100 + -- Sylvestre Ledru Wed, 06 Mar 2024 11:29:56 +0100 llvm-toolchain-18 (1:18.1.0~rc4-2) unstable; urgency=medium @@ -33,10 +34,8 @@ 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) - * Also install usr/lib/llvm-18/lib/libLLVM.so.1 - and usr/lib/llvm-18/lib/libLLVM.so.18.0 - -- Sylvestre Ledru Tue, 05 Mar 2024 23:05:07 +0100 + -- Sylvestre Ledru Wed, 28 Feb 2024 11:08:41 +0100 llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 8718033c..2b5c48e0 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ GCC_VERSION := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE)) 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_MINOR := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:[0-9]+\.(.*)\..*,\1,p") 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 @@ -317,8 +317,11 @@ ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) PROJECTS += ;bolt endif +LIBC_ENABLE=no ifneq (,$(filter libllvmlibc-$(LLVM_VERSION)-dev, $(packages))) + BOOTSTRAP_CMAKE_EXTRA += -DBOOTSTRAP_LIBC_INCLUDE_DOCS=ON RUNTIMES += ;libc + LIBC_ENABLE=yes endif # flang is only for 64bits @@ -621,7 +624,7 @@ stamps/preconfigure: -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ -e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \ - -e "s|@LLVM_VERSION_MINOR@|$(LLVM_VERSION_MINOR)|g" \ + -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; \ done @@ -1333,7 +1336,7 @@ 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) +# rm -rf $(TARGET_BUILD) # FIXME: why a stamp for dh_override_install ? touch $@ From 25de83aaa5aedfe75de1b137b39f9b3a8762e855 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 6 Mar 2024 21:49:36 +0100 Subject: [PATCH 176/302] Undo the commenting of rm -rf --- debian/changelog | 7 +++++++ debian/rules | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b00e9d73..972f166a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.0-2) unstable; urgency=medium + + * Uncomment wrong removal of rm code from last upload. + - this should fix the current FTBFS + + -- Gianfranco Costamagna Wed, 06 Mar 2024 21:49:10 +0100 + llvm-toolchain-18 (1:18.1.0-1) unstable; urgency=medium * New stable release diff --git a/debian/rules b/debian/rules index 2b5c48e0..0f6bdf09 100755 --- a/debian/rules +++ b/debian/rules @@ -1336,7 +1336,7 @@ 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) + rm -rf $(TARGET_BUILD) # FIXME: why a stamp for dh_override_install ? touch $@ From 6429a76c2a8fe3f61d5906425d8b523f82085de9 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 7 Mar 2024 17:02:50 +0100 Subject: [PATCH 177/302] * Fix sanitizer build on 32bit time_t64 architectures. --- debian/changelog | 6 ++++++ debian/patches/libsanitizer-timebits.diff | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/libsanitizer-timebits.diff diff --git a/debian/changelog b/debian/changelog index 972f166a..f0b466b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.0-3) UNRELEASED; urgency=medium + + * Fix sanitizer build on 32bit time_t64 architectures. + + -- Matthias Klose Thu, 07 Mar 2024 17:02:04 +0100 + llvm-toolchain-18 (1:18.1.0-2) unstable; urgency=medium * Uncomment wrong removal of rm code from last upload. 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 170f00de..e1071e96 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -149,3 +149,4 @@ libclang-major-version-only.diff D148945-revert.diff arm32-defaults.diff mips/D154390-pre-R6.diff +libsanitizer-timebits.diff From 4a5c909594c2a75adda63c8e62a35954c03a37c4 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 8 Mar 2024 15:44:50 +0100 Subject: [PATCH 178/302] * Enable compiler-rt runtime again for 32bit time_t64 architectures. * Revert: mark profile and xray include files as optional on armel and armhf. --- debian/changelog | 2 ++ debian/libclang-common-X.Y-dev.install.in | 4 ++-- debian/rules | 12 ++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index f0b466b7..0da8721d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ llvm-toolchain-18 (1:18.1.0-3) UNRELEASED; urgency=medium * Fix sanitizer build on 32bit time_t64 architectures. + * Enable compiler-rt runtime again for 32bit time_t64 architectures. + * Revert: mark profile and xray include files as optional on armel and armhf. -- Matthias Klose Thu, 07 Mar 2024 17:02:04 +0100 diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index a2725566..b059a8ed 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/ +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ +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 0f6bdf09..322c2d1b 100755 --- a/debian/rules +++ b/debian/rules @@ -25,16 +25,8 @@ LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$N # dpkg-buildflags support # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto -ifeq ($(DEB_HOST_ARCH),i386) - RUNTIMES = compiler-rt;libcxx;libcxxabi -else - ifeq ($(DEB_HOST_ARCH_BITS),32) - RUNTIMES = libcxx;libcxxabi - skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev - else - RUNTIMES = compiler-rt;libcxx;libcxxabi - endif -endif + +RUNTIMES = compiler-rt;libcxx;libcxxabi SOURCE_NAME := $(shell dpkg-parsechangelog -S Source) ifneq (,$(findstring snapshot,$(SOURCE_NAME))) From 87a903d19148dfe6dc373a35aa18a8cfb352260b Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 8 Mar 2024 16:50:50 +0100 Subject: [PATCH 179/302] Drop extra hack --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 322c2d1b..d57e9d99 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,6 @@ LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$N # dpkg-buildflags support # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto - RUNTIMES = compiler-rt;libcxx;libcxxabi SOURCE_NAME := $(shell dpkg-parsechangelog -S Source) @@ -1138,7 +1137,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 || true + chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so endif endif From 841e1ce65bc6dc183be704fa9f0a53fd70f3463c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Mar 2024 20:27:25 +0100 Subject: [PATCH 180/302] Disable libc on bionic for apt.llvm.org --- debian/changelog | 6 +++++- debian/rules | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0da8721d..f45a835e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ llvm-toolchain-18 (1:18.1.0-3) UNRELEASED; urgency=medium + [ Matthias Klose ] * Fix sanitizer build on 32bit time_t64 architectures. * Enable compiler-rt runtime again for 32bit time_t64 architectures. * Revert: mark profile and xray include files as optional on armel and armhf. - -- Matthias Klose Thu, 07 Mar 2024 17:02:04 +0100 + [ Sylvestre Ledru ] + * Disable libc on bionic for apt.llvm.org + + -- Sylvestre Ledru Fri, 08 Mar 2024 20:27:05 +0100 llvm-toolchain-18 (1:18.1.0-2) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index d57e9d99..4a5d0b52 100755 --- a/debian/rules +++ b/debian/rules @@ -309,11 +309,14 @@ ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) endif LIBC_ENABLE=no +LIBC_DISABLE_DISTRO := bionic ifneq (,$(filter libllvmlibc-$(LLVM_VERSION)-dev, $(packages))) +ifneq (,$(filter $(DISTRO),$(LIBC_DISABLE_DISTRO))) BOOTSTRAP_CMAKE_EXTRA += -DBOOTSTRAP_LIBC_INCLUDE_DOCS=ON RUNTIMES += ;libc LIBC_ENABLE=yes endif +endif # flang is only for 64bits ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) From 71f2952b6d3fec125a7ee244314d96be80901f7c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 8 Mar 2024 21:20:29 +0100 Subject: [PATCH 181/302] Try to address a link issue with libclang-cpp.so.18 (GH: #83986) --- debian/changelog | 1 + debian/libclang-cppX.Y.links.in | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f45a835e..d6cddb6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ llvm-toolchain-18 (1:18.1.0-3) UNRELEASED; urgency=medium [ Sylvestre Ledru ] * Disable libc on bionic for apt.llvm.org + * Try to address a link issue with libclang-cpp.so.18 (GH: #83986) -- Sylvestre Ledru Fri, 08 Mar 2024 20:27:05 +0100 diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Y.links.in index ee382f6d..e76b5b28 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@ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@.1 From 2ac4279a502b5008dd5c08b7afb8633da75a1c6b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 9 Mar 2024 00:02:48 +0100 Subject: [PATCH 182/302] improve the libc check --- debian/rules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 4a5d0b52..6f43840b 100755 --- a/debian/rules +++ b/debian/rules @@ -311,7 +311,10 @@ endif LIBC_ENABLE=no LIBC_DISABLE_DISTRO := bionic ifneq (,$(filter libllvmlibc-$(LLVM_VERSION)-dev, $(packages))) -ifneq (,$(filter $(DISTRO),$(LIBC_DISABLE_DISTRO))) +ifeq (,$(filter-out $(LIBC_DISABLE_DISTRO), $(DISTRO))) +# disable libc on bionic. See https://github.com/llvm/llvm-project/issues/82467 + LIBC_ENABLE=no +else BOOTSTRAP_CMAKE_EXTRA += -DBOOTSTRAP_LIBC_INCLUDE_DOCS=ON RUNTIMES += ;libc LIBC_ENABLE=yes From 479f9879dfe173f42aa189ceb37cccd9c5db1731 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Mar 2024 13:27:30 +0100 Subject: [PATCH 183/302] add a C++ module test --- debian/qualify-clang.sh | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index cf5941bc..85702754 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1015,6 +1015,52 @@ rm -f plugin.so echo '#include int main() {}' | clang++-$VERSION -std=c++1z -x c++ -stdlib=libc++ - +# testing C++ libc++ modules +cat << EOF > foo.cpp +import std; +import std.compat; + +int main() { + std::cout << "Hello modular world\n"; + ::printf("Hello compat modular world\n"); +} +EOF + +# Builds the std module +clang++-$VERSION -std=c++20 \ + -nostdinc++ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ + --precompile -o std.pcm \ + -c /usr/lib/llvm-$VERSION/share/libc++/v1/std.cppm + +# Builds the std.compat module +clang++-$VERSION -std=c++20 \ + -nostdinc++ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ + --precompile -o std.compat.pcm \ + -fmodule-file=std=std.pcm \ + -c /usr/lib/llvm-$VERSION/share/libc++/v1/std.compat.cppm + +# Builds the test application +clang++-$VERSION -std=c++20 \ + -nostdinc++ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -L /usr/lib/llvm-$VERSION/lib \ + -fmodule-file=std=std.pcm \ + -fmodule-file=std.compat=std.compat.pcm \ + std.pcm \ + std.compat.pcm \ + -lc++ \ + foo.cpp + +# Runs the test application +# The output should be +# Hello modular world +# Hello compat modular world +./a.out + if test ! -f /usr/lib/llvm-$VERSION/include/cxxabi.h; then echo "Install libc++abi-$VERSION-dev"; exit -1; From 8cfa278f7bcbb7e36a568cb78717f39fcd4735ef Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 9 Mar 2024 08:17:17 +0100 Subject: [PATCH 184/302] show the value of the libc install --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 6f43840b..ec8e1ec2 100755 --- a/debian/rules +++ b/debian/rules @@ -609,6 +609,7 @@ stamps/preconfigure: @echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)" @echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)" @echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)" + @echo "LIBC_ENABLE=$(LIBC_ENABLE)" @echo "LLVM_SPIRV=$(LLVM_SPIRV)" @echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)" @echo "DOC_GENERATION=$(DOC_GENERATION)" From cf5b006c6c562d773714850ee16fc9ad66297049 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 9 Mar 2024 08:27:59 +0100 Subject: [PATCH 185/302] new upstream release --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d6cddb6c..f20a0a95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-18 (1:18.1.0-3) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.1-1) unstable; urgency=medium [ Matthias Klose ] * Fix sanitizer build on 32bit time_t64 architectures. From 6ccf025a03e109392366dd352be8b642ab967f00 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 12 Mar 2024 18:21:39 +0100 Subject: [PATCH 186/302] * Build-depend on llvm-spirv-18 instead of llvm-spirv-17. --- 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 f20a0a95..aea88a95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.1-2) UNRELEASED; urgency=medium + + * Build-depend on llvm-spirv-18 instead of llvm-spirv-17. + + -- Matthias Klose Tue, 12 Mar 2024 18:21:05 +0100 + llvm-toolchain-18 (1:18.1.1-1) unstable; urgency=medium [ Matthias Klose ] diff --git a/debian/control b/debian/control index 830b4ec6..814daf19 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 741a421c..453fe1b2 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 08dfdeb5a8c214b023bbc1b0302e629de66293bd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Mar 2024 14:08:58 +0100 Subject: [PATCH 187/302] finish the management when libc is disabled --- debian/rules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/rules b/debian/rules index ec8e1ec2..22f63f8b 100755 --- a/debian/rules +++ b/debian/rules @@ -1328,6 +1328,10 @@ endif if test "$(LLDB_PYTHON_ENABLE)" = no; then \ echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \ fi +# if libc isn't built, remove what we want to install + if test "$(LIBC_ENABLE)" = no; then \ + echo "" > debian/libllvmlibc-$(LLVM_VERSION)-dev.install; \ + fi # Remove some mlir example rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libMyExtensionCh*.a @@ -1481,7 +1485,9 @@ endif ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxx || true # Libc +ifeq (${LIBC_ENABLE},yes) ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libc || true +endif # Libcxxabi ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true From 4d034a9a83c687c179fba5e6977176fe0cf672f5 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 16 Mar 2024 20:01:46 +0100 Subject: [PATCH 188/302] * 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 aea88a95..82fa2237 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-18 (1:18.1.1-2) UNRELEASED; urgency=medium * 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 18:21:05 +0100 diff --git a/debian/control b/debian/control index 814daf19..2ff41452 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 453fe1b2..672e748c 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 22f63f8b..8d1489bc 100755 --- a/debian/rules +++ b/debian/rules @@ -159,6 +159,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) @@ -169,6 +170,7 @@ endif endif endif endif +endif export CC=gcc-$(GCC_VERSION) export CXX=g++-$(GCC_VERSION) @@ -267,6 +269,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 @@ -288,6 +293,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 = @@ -768,7 +774,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 \ @@ -821,7 +827,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 2e5dcb35cdb2aaa355a2288f3a8be9215d23c90e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 16 Mar 2024 20:34:47 +0100 Subject: [PATCH 189/302] * Build with --as-needed. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 82fa2237..096213fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-18 (1:18.1.1-2) UNRELEASED; urgency=medium * Build-depend on llvm-spirv-18 instead of llvm-spirv-17. * Add a stage1 profile to disable curl, grpc and spirv. + * Build with --as-needed. -- Matthias Klose Tue, 12 Mar 2024 18:21:05 +0100 diff --git a/debian/rules b/debian/rules index 8d1489bc..ac451dc6 100755 --- a/debian/rules +++ b/debian/rules @@ -86,7 +86,7 @@ include /usr/share/dpkg/buildflags.mk # collect additional flags for all stages all builds CFLAGS_EXTRA = -Wno-unused-command-line-argument CXXFLAGS_EXTRA = -Wno-unused-command-line-argument -LDFLAGS_EXTRA = -Wl,--build-id +LDFLAGS_EXTRA = -Wl,--build-id,--as-needed # collect all flags for stage 1 toolchain build only STAGE_1_CFLAGS = $(CFLAGS) $(CFLAGS_EXTRA) $(CPPFLAGS) From 84711da234760bd574584524fafa289b291289a5 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 16 Mar 2024 21:14:52 +0100 Subject: [PATCH 190/302] also add spriv-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 2ff41452..46e825e2 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 672e748c..04af789e 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 089c187448198e95bf6d12e4cd01ee5dfac3f1d3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 17 Mar 2024 10:13:48 +0100 Subject: [PATCH 191/302] Build using mold --- debian/changelog | 6 +++++- debian/control | 2 +- debian/control.in | 2 +- debian/rules | 4 ++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 096213fd..3e92ad9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ llvm-toolchain-18 (1:18.1.1-2) UNRELEASED; urgency=medium + [ Matthias Klose ] * Build-depend on llvm-spirv-18 instead of llvm-spirv-17. * Add a stage1 profile to disable curl, grpc and spirv. * Build with --as-needed. - -- Matthias Klose Tue, 12 Mar 2024 18:21:05 +0100 + [ Sylvestre Ledru ] + * Build using mold as a linker + + -- Sylvestre Ledru Sun, 17 Mar 2024 10:13:36 +0100 llvm-toolchain-18 (1:18.1.1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 46e825e2..ce565ec3 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Rules-Requires-Root: no Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru , Gianfranco Costamagna Build-Depends: debhelper (>= 10.0), cmake, ninja-build, - chrpath, texinfo, sharutils, + chrpath, texinfo, sharutils, mold, libelf-dev, libffi-dev, lsb-release, patchutils, diffstat, xz-utils, python3-dev, diff --git a/debian/control.in b/debian/control.in index 04af789e..85287059 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,7 +5,7 @@ Rules-Requires-Root: no Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru , Gianfranco Costamagna Build-Depends: debhelper (>= 10.0), cmake, ninja-build, - chrpath, texinfo, sharutils, + chrpath, texinfo, sharutils, mold, libelf-dev, libffi-dev, lsb-release, patchutils, diffstat, xz-utils, python3-dev, diff --git a/debian/rules b/debian/rules index ac451dc6..961201db 100755 --- a/debian/rules +++ b/debian/rules @@ -302,6 +302,10 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV) endif +# Use mold as a linker. Faster than the other. +# This will need to be updated for apt.llvm.org as mold isn't available everywhere. +STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=mold + 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))) From 9740d53d94b80205347ba3b02720ed8cf20b9b89 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 17 Mar 2024 10:17:53 +0100 Subject: [PATCH 192/302] mold: disable on old distro --- debian/rules | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 961201db..3c5063e1 100755 --- a/debian/rules +++ b/debian/rules @@ -303,16 +303,25 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) endif # Use mold as a linker. Faster than the other. -# This will need to be updated for apt.llvm.org as mold isn't available everywhere. -STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=mold +MOLD_DISABLE_DISTRO := bionic buster focal buster bullseye +ifeq (,$(filter-out $(LIBC_DISABLE_DISTRO), $(DISTRO))) +# mold is too old on this distro + MOLD_ENABLE=no +else + MOLD_ENABLE=yes + STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=mold +endif 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))) +ifeq (${MOLD_ENABLE},no) +# don't do it when MOLD is enabled STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold STAGE_ALL_CMAKE_EXTRA += -DLLVM_BINUTILS_INCDIR=/usr/include/ endif endif +endif ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) PROJECTS += ;bolt @@ -620,6 +629,7 @@ stamps/preconfigure: @echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)" @echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)" @echo "LIBC_ENABLE=$(LIBC_ENABLE)" + @echo "MOLD_ENABLE=$(MOLD_ENABLE)" @echo "LLVM_SPIRV=$(LLVM_SPIRV)" @echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)" @echo "DOC_GENERATION=$(DOC_GENERATION)" From a8bd42103898eeffc7f18807eeafa636c7d13708 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 18 Mar 2024 11:02:49 +0100 Subject: [PATCH 193/302] disable mold on bookworm --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 3c5063e1..41c7862a 100755 --- a/debian/rules +++ b/debian/rules @@ -303,7 +303,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) endif # Use mold as a linker. Faster than the other. -MOLD_DISABLE_DISTRO := bionic buster focal buster bullseye +MOLD_DISABLE_DISTRO := bionic buster focal buster bullseye bookworm ifeq (,$(filter-out $(LIBC_DISABLE_DISTRO), $(DISTRO))) # mold is too old on this distro MOLD_ENABLE=no From 4a21831337e6d75c9a501c1589e3d1af9b63cffb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 18 Mar 2024 11:54:20 +0100 Subject: [PATCH 194/302] refresh symbols --- debian/libclang1-X.Y.symbols.in | 3 - debian/libomp5-X.Y.symbols.in | 376 ++++++++++++++------------------ 2 files changed, 162 insertions(+), 217 deletions(-) diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in index 2f07205d..8b611085 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Y.symbols.in @@ -1,7 +1,4 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER# - (optional)LLVM_13@LLVM_13 1:15.0.7-3 - (optional)LLVM_16@LLVM_16 1:16.0.2-1 - (optional)LLVM_17@LLVM_17 1:17.0.1-1 clang_BlockCommandComment_getArgText@LLVM_13 1:5.0~svn298832-1~ clang_BlockCommandComment_getCommandName@LLVM_13 1:5.0~svn298832-1~ clang_BlockCommandComment_getNumArgs@LLVM_13 1:5.0~svn298832-1~ diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in index 523fe7ce..b99ea8e9 100644 --- a/debian/libomp5-X.Y.symbols.in +++ b/debian/libomp5-X.Y.symbols.in @@ -1,11 +1,4 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# - GOMP_1.0@GOMP_1.0 0.20131209 - GOMP_2.0@GOMP_2.0 0.20131209 - GOMP_3.0@GOMP_3.0 0.20131209 - GOMP_4.0@GOMP_4.0 0.20131209 - GOMP_4.5@GOMP_4.5 7 - GOMP_5.0.1@GOMP_5.0.1 14 - GOMP_5.0@GOMP_5.0 11 GOMP_alloc@GOMP_5.0.1 14 GOMP_alloc@VERSION 14 GOMP_atomic_end@GOMP_1.0 0.20131209 @@ -262,14 +255,6 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# GOMP_teams_reg@VERSION 12 GOMP_workshare_task_reduction_unregister@GOMP_5.0 13 GOMP_workshare_task_reduction_unregister@VERSION 13 - OMP_1.0@OMP_1.0 0.20131209 - OMP_2.0@OMP_2.0 0.20131209 - OMP_3.0@OMP_3.0 0.20131209 - OMP_3.1@OMP_3.1 0.20131209 - OMP_4.0@OMP_4.0 0.20131209 - OMP_4.5@OMP_4.5 7 - OMP_5.0@OMP_5.0 13 - VERSION@VERSION 0.20130412 ___kmp_allocate@VERSION 0.20130412 ___kmp_free@VERSION 0.20130412 __kmp_acquire_drdpa_lock@VERSION 0.20130715 @@ -327,21 +312,6 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub_rev@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_wr@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_cmplx16_add@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_cmplx16_div@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_cmplx16_mul@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_rd@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_cmplx16_sub@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_swp@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_wr@VERSION 0.20130412 __kmpc_atomic_cmplx4_add@VERSION 0.20130412 __kmpc_atomic_cmplx4_add_cmplx8@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_add_cpt@VERSION 0.20130412 @@ -379,21 +349,15 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_end@VERSION 0.20130412 (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed1_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed1_add_fp@VERSION 0.20130412 __kmpc_atomic_fixed1_andb@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_andb_cpt@VERSION 0.20130412 __kmpc_atomic_fixed1_andl@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_andl_cpt@VERSION 0.20130412 __kmpc_atomic_fixed1_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_fixed1_div_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_rev_fp@VERSION 4.0 __kmpc_atomic_fixed1_eqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_eqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed1_max@VERSION 0.20130412 @@ -402,9 +366,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_min_cpt@VERSION 0.20130412 __kmpc_atomic_fixed1_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_fixed1_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed1_mul_fp@VERSION 0.20130412 __kmpc_atomic_fixed1_neqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_neqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed1_orb@VERSION 0.20130412 @@ -422,21 +384,14 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shr_rev@VERSION 0.20130412 __kmpc_atomic_fixed1_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_sub_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_rev_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_wr@VERSION 0.20130412 __kmpc_atomic_fixed1_xor@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_xor_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1u_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed1u_add_fp@VERSION 4.0 __kmpc_atomic_fixed1u_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1u_div_fp@VERSION 0.20130412 @@ -790,7 +745,6 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_sub_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_rev_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_wr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_start@VERSION 0.20130412 @@ -1031,7 +985,6 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# kmpc_set_stacksize@VERSION 0.20130412 kmpc_set_stacksize_s@VERSION 0.20130412 kmpc_unset_affinity_mask_proc@VERSION 0.20130412 -#MISSING: 14# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)libomp_start_tool@VERSION 14 omp_aligned_alloc@VERSION 14 omp_aligned_calloc@VERSION 14 omp_alloc@VERSION 8 @@ -1309,7 +1262,6 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# omp_set_schedule_@VERSION 0.20130412 omp_set_teams_thread_limit@VERSION 13 omp_set_teams_thread_limit_@VERSION 13 -#MISSING: 8# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)omp_state_info@VERSION 6.0 omp_test_lock@OMP_1.0 0.20131209 omp_test_lock@OMP_3.0 0.20131209 omp_test_lock@VERSION 0.20130412 @@ -1348,190 +1300,186 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# ompc_set_schedule@VERSION 0.20130412 ompt_libomp_connect@VERSION 17 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)ompt_start_tool@VERSION 6.0 -libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# - VERS1.0@VERS1.0 17 - __tgt_rtl_create_event@VERS1.0 17 - __tgt_rtl_data_alloc@VERS1.0 17 - __tgt_rtl_data_delete@VERS1.0 17 - __tgt_rtl_data_exchange@VERS1.0 17 - __tgt_rtl_data_exchange_async@VERS1.0 17 - __tgt_rtl_data_lock@VERS1.0 17 - __tgt_rtl_data_notify_mapped@VERS1.0 17 - __tgt_rtl_data_notify_unmapped@VERS1.0 17 - __tgt_rtl_data_retrieve@VERS1.0 17 - __tgt_rtl_data_retrieve_async@VERS1.0 17 - __tgt_rtl_data_submit@VERS1.0 17 - __tgt_rtl_data_submit_async@VERS1.0 17 - __tgt_rtl_data_unlock@VERS1.0 17 - __tgt_rtl_destroy_event@VERS1.0 17 +libomptarget.rtl.amdgpu.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# + __tgt_rtl_create_event@VERS1.0 18 + __tgt_rtl_data_alloc@VERS1.0 18 + __tgt_rtl_data_delete@VERS1.0 18 + __tgt_rtl_data_exchange@VERS1.0 18 + __tgt_rtl_data_exchange_async@VERS1.0 18 + __tgt_rtl_data_lock@VERS1.0 18 + __tgt_rtl_data_notify_mapped@VERS1.0 18 + __tgt_rtl_data_notify_unmapped@VERS1.0 18 + __tgt_rtl_data_retrieve@VERS1.0 18 + __tgt_rtl_data_retrieve_async@VERS1.0 18 + __tgt_rtl_data_submit@VERS1.0 18 + __tgt_rtl_data_submit_async@VERS1.0 18 + __tgt_rtl_data_unlock@VERS1.0 18 + __tgt_rtl_destroy_event@VERS1.0 18 __tgt_rtl_get_function@VERS1.0 18 __tgt_rtl_get_global@VERS1.0 18 - __tgt_rtl_init_async_info@VERS1.0 17 - __tgt_rtl_init_device@VERS1.0 17 - __tgt_rtl_init_device_info@VERS1.0 17 - __tgt_rtl_init_plugin@VERS1.0 17 - __tgt_rtl_init_requires@VERS1.0 17 + __tgt_rtl_init_async_info@VERS1.0 18 + __tgt_rtl_init_device@VERS1.0 18 + __tgt_rtl_init_device_info@VERS1.0 18 + __tgt_rtl_init_plugin@VERS1.0 18 + __tgt_rtl_init_requires@VERS1.0 18 __tgt_rtl_initialize_record_replay@VERS1.0 18 - __tgt_rtl_is_data_exchangable@VERS1.0 17 + __tgt_rtl_is_data_exchangable@VERS1.0 18 __tgt_rtl_is_valid_binary@VERS1.0 18 - __tgt_rtl_launch_kernel@VERS1.0 17 - __tgt_rtl_load_binary@VERS1.0 17 - __tgt_rtl_number_of_devices@VERS1.0 17 - __tgt_rtl_print_device_info@VERS1.0 17 - __tgt_rtl_query_async@VERS1.0 17 - __tgt_rtl_record_event@VERS1.0 17 + __tgt_rtl_launch_kernel@VERS1.0 18 + __tgt_rtl_load_binary@VERS1.0 18 + __tgt_rtl_number_of_devices@VERS1.0 18 + __tgt_rtl_print_device_info@VERS1.0 18 + __tgt_rtl_query_async@VERS1.0 18 + __tgt_rtl_record_event@VERS1.0 18 __tgt_rtl_set_device_offset@VERS1.0 18 - __tgt_rtl_set_info_flag@VERS1.0 17 - __tgt_rtl_supports_empty_images@VERS1.0 17 - __tgt_rtl_sync_event@VERS1.0 17 - __tgt_rtl_synchronize@VERS1.0 17 + __tgt_rtl_set_info_flag@VERS1.0 18 + __tgt_rtl_supports_empty_images@VERS1.0 18 + __tgt_rtl_sync_event@VERS1.0 18 + __tgt_rtl_synchronize@VERS1.0 18 __tgt_rtl_use_auto_zero_copy@VERS1.0 18 - __tgt_rtl_wait_event@VERS1.0 17 -libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# - VERS1.0@VERS1.0 17 - __tgt_rtl_create_event@VERS1.0 17 - __tgt_rtl_data_alloc@VERS1.0 17 - __tgt_rtl_data_delete@VERS1.0 17 - __tgt_rtl_data_exchange@VERS1.0 17 - __tgt_rtl_data_exchange_async@VERS1.0 17 - __tgt_rtl_data_lock@VERS1.0 17 - __tgt_rtl_data_notify_mapped@VERS1.0 17 - __tgt_rtl_data_notify_unmapped@VERS1.0 17 - __tgt_rtl_data_retrieve@VERS1.0 17 - __tgt_rtl_data_retrieve_async@VERS1.0 17 - __tgt_rtl_data_submit@VERS1.0 17 - __tgt_rtl_data_submit_async@VERS1.0 17 - __tgt_rtl_data_unlock@VERS1.0 17 - __tgt_rtl_destroy_event@VERS1.0 17 + __tgt_rtl_wait_event@VERS1.0 18 +libomptarget.rtl.cuda.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# + __tgt_rtl_create_event@VERS1.0 18 + __tgt_rtl_data_alloc@VERS1.0 18 + __tgt_rtl_data_delete@VERS1.0 18 + __tgt_rtl_data_exchange@VERS1.0 18 + __tgt_rtl_data_exchange_async@VERS1.0 18 + __tgt_rtl_data_lock@VERS1.0 18 + __tgt_rtl_data_notify_mapped@VERS1.0 18 + __tgt_rtl_data_notify_unmapped@VERS1.0 18 + __tgt_rtl_data_retrieve@VERS1.0 18 + __tgt_rtl_data_retrieve_async@VERS1.0 18 + __tgt_rtl_data_submit@VERS1.0 18 + __tgt_rtl_data_submit_async@VERS1.0 18 + __tgt_rtl_data_unlock@VERS1.0 18 + __tgt_rtl_destroy_event@VERS1.0 18 __tgt_rtl_get_function@VERS1.0 18 __tgt_rtl_get_global@VERS1.0 18 - __tgt_rtl_init_async_info@VERS1.0 17 - __tgt_rtl_init_device@VERS1.0 17 - __tgt_rtl_init_device_info@VERS1.0 17 - __tgt_rtl_init_plugin@VERS1.0 17 - __tgt_rtl_init_requires@VERS1.0 17 + __tgt_rtl_init_async_info@VERS1.0 18 + __tgt_rtl_init_device@VERS1.0 18 + __tgt_rtl_init_device_info@VERS1.0 18 + __tgt_rtl_init_plugin@VERS1.0 18 + __tgt_rtl_init_requires@VERS1.0 18 __tgt_rtl_initialize_record_replay@VERS1.0 18 - __tgt_rtl_is_data_exchangable@VERS1.0 17 + __tgt_rtl_is_data_exchangable@VERS1.0 18 __tgt_rtl_is_valid_binary@VERS1.0 18 - __tgt_rtl_launch_kernel@VERS1.0 17 - __tgt_rtl_load_binary@VERS1.0 17 - __tgt_rtl_number_of_devices@VERS1.0 17 - __tgt_rtl_print_device_info@VERS1.0 17 - __tgt_rtl_query_async@VERS1.0 17 - __tgt_rtl_record_event@VERS1.0 17 + __tgt_rtl_launch_kernel@VERS1.0 18 + __tgt_rtl_load_binary@VERS1.0 18 + __tgt_rtl_number_of_devices@VERS1.0 18 + __tgt_rtl_print_device_info@VERS1.0 18 + __tgt_rtl_query_async@VERS1.0 18 + __tgt_rtl_record_event@VERS1.0 18 __tgt_rtl_set_device_offset@VERS1.0 18 - __tgt_rtl_set_info_flag@VERS1.0 17 - __tgt_rtl_supports_empty_images@VERS1.0 17 - __tgt_rtl_sync_event@VERS1.0 17 - __tgt_rtl_synchronize@VERS1.0 17 + __tgt_rtl_set_info_flag@VERS1.0 18 + __tgt_rtl_supports_empty_images@VERS1.0 18 + __tgt_rtl_sync_event@VERS1.0 18 + __tgt_rtl_synchronize@VERS1.0 18 __tgt_rtl_use_auto_zero_copy@VERS1.0 18 - __tgt_rtl_wait_event@VERS1.0 17 -libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# - VERS1.0@VERS1.0 17 - __tgt_rtl_create_event@VERS1.0 1:17.0.1-1 - __tgt_rtl_data_alloc@VERS1.0 17 - __tgt_rtl_data_delete@VERS1.0 17 - __tgt_rtl_data_exchange@VERS1.0 17 - __tgt_rtl_data_exchange_async@VERS1.0 17 - __tgt_rtl_data_lock@VERS1.0 17 - __tgt_rtl_data_notify_mapped@VERS1.0 17 - __tgt_rtl_data_notify_unmapped@VERS1.0 17 - __tgt_rtl_data_retrieve@VERS1.0 17 - __tgt_rtl_data_retrieve_async@VERS1.0 17 - __tgt_rtl_data_submit@VERS1.0 17 - __tgt_rtl_data_submit_async@VERS1.0 17 - __tgt_rtl_data_unlock@VERS1.0 17 - __tgt_rtl_destroy_event@VERS1.0 17 + __tgt_rtl_wait_event@VERS1.0 18 +libomptarget.rtl.x86_64.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# + __tgt_rtl_create_event@VERS1.0 18 + __tgt_rtl_data_alloc@VERS1.0 18 + __tgt_rtl_data_delete@VERS1.0 18 + __tgt_rtl_data_exchange@VERS1.0 18 + __tgt_rtl_data_exchange_async@VERS1.0 18 + __tgt_rtl_data_lock@VERS1.0 18 + __tgt_rtl_data_notify_mapped@VERS1.0 18 + __tgt_rtl_data_notify_unmapped@VERS1.0 18 + __tgt_rtl_data_retrieve@VERS1.0 18 + __tgt_rtl_data_retrieve_async@VERS1.0 18 + __tgt_rtl_data_submit@VERS1.0 18 + __tgt_rtl_data_submit_async@VERS1.0 18 + __tgt_rtl_data_unlock@VERS1.0 18 + __tgt_rtl_destroy_event@VERS1.0 18 __tgt_rtl_get_function@VERS1.0 18 __tgt_rtl_get_global@VERS1.0 18 - __tgt_rtl_init_async_info@VERS1.0 17 - __tgt_rtl_init_device@VERS1.0 17 - __tgt_rtl_init_device_info@VERS1.0 17 - __tgt_rtl_init_plugin@VERS1.0 17 - __tgt_rtl_init_requires@VERS1.0 17 + __tgt_rtl_init_async_info@VERS1.0 18 + __tgt_rtl_init_device@VERS1.0 18 + __tgt_rtl_init_device_info@VERS1.0 18 + __tgt_rtl_init_plugin@VERS1.0 18 + __tgt_rtl_init_requires@VERS1.0 18 __tgt_rtl_initialize_record_replay@VERS1.0 18 - __tgt_rtl_is_data_exchangable@VERS1.0 17 + __tgt_rtl_is_data_exchangable@VERS1.0 18 __tgt_rtl_is_valid_binary@VERS1.0 18 - __tgt_rtl_launch_kernel@VERS1.0 17 - __tgt_rtl_load_binary@VERS1.0 17 - __tgt_rtl_number_of_devices@VERS1.0 17 - __tgt_rtl_print_device_info@VERS1.0 17 - __tgt_rtl_query_async@VERS1.0 17 - __tgt_rtl_record_event@VERS1.0 17 + __tgt_rtl_launch_kernel@VERS1.0 18 + __tgt_rtl_load_binary@VERS1.0 18 + __tgt_rtl_number_of_devices@VERS1.0 18 + __tgt_rtl_print_device_info@VERS1.0 18 + __tgt_rtl_query_async@VERS1.0 18 + __tgt_rtl_record_event@VERS1.0 18 __tgt_rtl_set_device_offset@VERS1.0 18 - __tgt_rtl_set_info_flag@VERS1.0 17 - __tgt_rtl_supports_empty_images@VERS1.0 17 - __tgt_rtl_sync_event@VERS1.0 17 - __tgt_rtl_synchronize@VERS1.0 17 + __tgt_rtl_set_info_flag@VERS1.0 18 + __tgt_rtl_supports_empty_images@VERS1.0 18 + __tgt_rtl_sync_event@VERS1.0 18 + __tgt_rtl_synchronize@VERS1.0 18 __tgt_rtl_use_auto_zero_copy@VERS1.0 18 - __tgt_rtl_wait_event@VERS1.0 17 -libomptarget.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@ #MINVER# - VERS1.0@VERS1.0 17 - __kmpc_push_target_tripcount@VERS1.0 17 - __kmpc_push_target_tripcount_mapper@VERS1.0 17 + __tgt_rtl_wait_event@VERS1.0 18 +libomptarget.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# + __kmpc_push_target_tripcount@VERS1.0 18 + __kmpc_push_target_tripcount_mapper@VERS1.0 18 __tgt_activate_record_replay@VERS1.0 18 - __tgt_init_all_rtls@VERS1.0 17 - __tgt_interop_destroy@VERS1.0 17 - __tgt_interop_init@VERS1.0 17 - __tgt_interop_use@VERS1.0 17 - __tgt_mapper_num_components@VERS1.0 17 - __tgt_print_device_info@VERS1.0 17 - __tgt_push_mapper_component@VERS1.0 17 - __tgt_register_lib@VERS1.0 17 - __tgt_register_requires@VERS1.0 17 - __tgt_set_info_flag@VERS1.0 17 - __tgt_target@VERS1.0 17 - __tgt_target_data_begin@VERS1.0 17 - __tgt_target_data_begin_mapper@VERS1.0 17 - __tgt_target_data_begin_nowait@VERS1.0 17 - __tgt_target_data_begin_nowait_mapper@VERS1.0 17 - __tgt_target_data_end@VERS1.0 17 - __tgt_target_data_end_mapper@VERS1.0 17 - __tgt_target_data_end_nowait@VERS1.0 17 - __tgt_target_data_end_nowait_mapper@VERS1.0 17 - __tgt_target_data_update@VERS1.0 17 - __tgt_target_data_update_mapper@VERS1.0 17 - __tgt_target_data_update_nowait@VERS1.0 17 - __tgt_target_data_update_nowait_mapper@VERS1.0 17 - __tgt_target_kernel@VERS1.0 17 - __tgt_target_kernel_nowait@VERS1.0 17 - __tgt_target_kernel_replay@VERS1.0 17 - __tgt_target_mapper@VERS1.0 17 - __tgt_target_nowait@VERS1.0 17 - __tgt_target_nowait_mapper@VERS1.0 17 - __tgt_target_nowait_query@VERS1.0 17 - __tgt_target_teams@VERS1.0 17 - __tgt_target_teams_mapper@VERS1.0 17 - __tgt_target_teams_nowait@VERS1.0 17 - __tgt_target_teams_nowait_mapper@VERS1.0 17 - __tgt_unregister_lib@VERS1.0 17 - llvm_omp_target_alloc_device@VERS1.0 17 - llvm_omp_target_alloc_host@VERS1.0 17 - llvm_omp_target_alloc_shared@VERS1.0 17 - llvm_omp_target_dynamic_shared_alloc@VERS1.0 17 - llvm_omp_target_free_device@VERS1.0 17 - llvm_omp_target_free_host@VERS1.0 17 - llvm_omp_target_free_shared@VERS1.0 17 - llvm_omp_target_lock_mem@VERS1.0 17 - llvm_omp_target_unlock_mem@VERS1.0 17 - omp_get_device_num@VERS1.0 17 - omp_get_initial_device@VERS1.0 17 - omp_get_interop_int@VERS1.0 17 - omp_get_interop_name@VERS1.0 17 - omp_get_interop_ptr@VERS1.0 17 - omp_get_interop_str@VERS1.0 17 - omp_get_interop_type_desc@VERS1.0 17 - omp_get_mapped_ptr@VERS1.0 17 - omp_get_num_devices@VERS1.0 17 - omp_target_alloc@VERS1.0 17 - omp_target_associate_ptr@VERS1.0 17 - omp_target_disassociate_ptr@VERS1.0 17 - omp_target_free@VERS1.0 17 - omp_target_is_present@VERS1.0 17 - omp_target_memcpy@VERS1.0 17 - omp_target_memcpy_async@VERS1.0 17 - omp_target_memcpy_rect@VERS1.0 17 - omp_target_memcpy_rect_async@VERS1.0 17 + __tgt_init_all_rtls@VERS1.0 18 + __tgt_interop_destroy@VERS1.0 18 + __tgt_interop_init@VERS1.0 18 + __tgt_interop_use@VERS1.0 18 + __tgt_mapper_num_components@VERS1.0 18 + __tgt_print_device_info@VERS1.0 18 + __tgt_push_mapper_component@VERS1.0 18 + __tgt_register_lib@VERS1.0 18 + __tgt_register_requires@VERS1.0 18 + __tgt_set_info_flag@VERS1.0 18 + __tgt_target@VERS1.0 18 + __tgt_target_data_begin@VERS1.0 18 + __tgt_target_data_begin_mapper@VERS1.0 18 + __tgt_target_data_begin_nowait@VERS1.0 18 + __tgt_target_data_begin_nowait_mapper@VERS1.0 18 + __tgt_target_data_end@VERS1.0 18 + __tgt_target_data_end_mapper@VERS1.0 18 + __tgt_target_data_end_nowait@VERS1.0 18 + __tgt_target_data_end_nowait_mapper@VERS1.0 18 + __tgt_target_data_update@VERS1.0 18 + __tgt_target_data_update_mapper@VERS1.0 18 + __tgt_target_data_update_nowait@VERS1.0 18 + __tgt_target_data_update_nowait_mapper@VERS1.0 18 + __tgt_target_kernel@VERS1.0 18 + __tgt_target_kernel_nowait@VERS1.0 18 + __tgt_target_kernel_replay@VERS1.0 18 + __tgt_target_mapper@VERS1.0 18 + __tgt_target_nowait@VERS1.0 18 + __tgt_target_nowait_mapper@VERS1.0 18 + __tgt_target_nowait_query@VERS1.0 18 + __tgt_target_teams@VERS1.0 18 + __tgt_target_teams_mapper@VERS1.0 18 + __tgt_target_teams_nowait@VERS1.0 18 + __tgt_target_teams_nowait_mapper@VERS1.0 18 + __tgt_unregister_lib@VERS1.0 18 + llvm_omp_target_alloc_device@VERS1.0 18 + llvm_omp_target_alloc_host@VERS1.0 18 + llvm_omp_target_alloc_shared@VERS1.0 18 + llvm_omp_target_dynamic_shared_alloc@VERS1.0 18 + llvm_omp_target_free_device@VERS1.0 18 + llvm_omp_target_free_host@VERS1.0 18 + llvm_omp_target_free_shared@VERS1.0 18 + llvm_omp_target_lock_mem@VERS1.0 18 + llvm_omp_target_unlock_mem@VERS1.0 18 + omp_get_device_num@VERS1.0 18 + omp_get_initial_device@VERS1.0 18 + omp_get_interop_int@VERS1.0 18 + omp_get_interop_name@VERS1.0 18 + omp_get_interop_ptr@VERS1.0 18 + omp_get_interop_str@VERS1.0 18 + omp_get_interop_type_desc@VERS1.0 18 + omp_get_mapped_ptr@VERS1.0 18 + omp_get_num_devices@VERS1.0 18 + omp_target_alloc@VERS1.0 18 + omp_target_associate_ptr@VERS1.0 18 + omp_target_disassociate_ptr@VERS1.0 18 + omp_target_free@VERS1.0 18 + omp_target_is_present@VERS1.0 18 + omp_target_memcpy@VERS1.0 18 + omp_target_memcpy_async@VERS1.0 18 + omp_target_memcpy_rect@VERS1.0 18 + omp_target_memcpy_rect_async@VERS1.0 18 omp_target_memset@VERS1.0 18 omp_target_memset_async@VERS1.0 18 - ompt_libomptarget_connect@VERS1.0 17 + ompt_libomptarget_connect@VERS1.0 18 From e6ae36a279fed765de6b9d90a93c6a1faaf1aeb4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 18 Mar 2024 11:54:44 +0100 Subject: [PATCH 195/302] remove old missing in symbols --- debian/libomp5-X.Y.symbols.in | 135 ---------------------------------- 1 file changed, 135 deletions(-) diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in index b99ea8e9..1c77b560 100644 --- a/debian/libomp5-X.Y.symbols.in +++ b/debian/libomp5-X.Y.symbols.in @@ -393,37 +393,22 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_atomic_fixed1u_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_cpt@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1u_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_mul_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_mul_fp@VERSION 4.0 __kmpc_atomic_fixed1u_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_cpt@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_shr_cpt_rev@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_shr_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_sub_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_sub_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed1u_sub_rev_fp@VERSION 5.0 __kmpc_atomic_fixed2_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed2_add_fp@VERSION 0.20130412 __kmpc_atomic_fixed2_andb@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_andb_cpt@VERSION 0.20130412 __kmpc_atomic_fixed2_andl@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_andl_cpt@VERSION 0.20130412 __kmpc_atomic_fixed2_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_fixed2_div_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_rev_fp@VERSION 4.0 __kmpc_atomic_fixed2_eqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_eqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed2_max@VERSION 0.20130412 @@ -432,9 +417,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_min_cpt@VERSION 0.20130412 __kmpc_atomic_fixed2_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_fixed2_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed2_mul_fp@VERSION 0.20130412 __kmpc_atomic_fixed2_neqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_neqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed2_orb@VERSION 0.20130412 @@ -452,53 +435,31 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shr_rev@VERSION 0.20130412 __kmpc_atomic_fixed2_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_sub_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_rev_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_wr@VERSION 0.20130412 __kmpc_atomic_fixed2_xor@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_xor_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2u_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed2u_add_fp@VERSION 4.0 __kmpc_atomic_fixed2u_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2u_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_mul_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_mul_fp@VERSION 4.0 __kmpc_atomic_fixed2u_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_cpt@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_shr_cpt_rev@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_shr_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_sub_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_sub_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed2u_sub_rev_fp@VERSION 5.0 __kmpc_atomic_fixed4_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed4_add_fp@VERSION 0.20130412 __kmpc_atomic_fixed4_andb@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_andb_cpt@VERSION 0.20130412 __kmpc_atomic_fixed4_andl@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_andl_cpt@VERSION 0.20130412 __kmpc_atomic_fixed4_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_fixed4_div_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_rev_fp@VERSION 4.0 __kmpc_atomic_fixed4_eqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_eqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed4_max@VERSION 0.20130412 @@ -507,9 +468,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_min_cpt@VERSION 0.20130412 __kmpc_atomic_fixed4_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_fixed4_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed4_mul_fp@VERSION 0.20130412 __kmpc_atomic_fixed4_neqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_neqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed4_orb@VERSION 0.20130412 @@ -527,53 +486,31 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shr_rev@VERSION 0.20130412 __kmpc_atomic_fixed4_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_sub_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_rev_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_wr@VERSION 0.20130412 __kmpc_atomic_fixed4_xor@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_xor_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4u_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed4u_add_fp@VERSION 4.0 (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed4u_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4u_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_mul_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_mul_fp@VERSION 4.0 __kmpc_atomic_fixed4u_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_cpt@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_shr_cpt_rev@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_shr_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_sub_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_sub_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed4u_sub_rev_fp@VERSION 5.0 (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed8_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed8_add_fp@VERSION 0.20130412 __kmpc_atomic_fixed8_andb@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_andb_cpt@VERSION 0.20130412 __kmpc_atomic_fixed8_andl@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_andl_cpt@VERSION 0.20130412 __kmpc_atomic_fixed8_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_fixed8_div_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_rev_fp@VERSION 4.0 __kmpc_atomic_fixed8_eqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_eqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed8_max@VERSION 0.20130412 @@ -582,9 +519,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_min_cpt@VERSION 0.20130412 __kmpc_atomic_fixed8_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_fixed8_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed8_mul_fp@VERSION 0.20130412 __kmpc_atomic_fixed8_neqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_neqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed8_orb@VERSION 0.20130412 @@ -602,148 +537,78 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shr_rev@VERSION 0.20130412 __kmpc_atomic_fixed8_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_sub_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_rev_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_wr@VERSION 0.20130412 __kmpc_atomic_fixed8_xor@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_xor_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8u_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed8u_add_fp@VERSION 4.0 __kmpc_atomic_fixed8u_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8u_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_mul_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_mul_fp@VERSION 4.0 __kmpc_atomic_fixed8u_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_cpt@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_shr_cpt_rev@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_shr_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_sub_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_sub_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed8u_sub_rev_fp@VERSION 5.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_add_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_rev_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_max@VERSION 14 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_max_cpt@VERSION 14 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_min@VERSION 14 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_min_cpt@VERSION 14 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_mul_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float10_mul_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_rd@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_sub_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_rev_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_wr@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_add@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_div@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_max@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_max_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_min@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_min_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_mul@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_rd@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_sub@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_swp@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_wr@VERSION 0.20130412 __kmpc_atomic_float4_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_add_cpt_fp@VERSION 4.0 (arch=!ppc64 !ppc64el)__kmpc_atomic_float4_add_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float4_add_fp@VERSION 0.20130412 __kmpc_atomic_float4_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_float4_div_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_rev_fp@VERSION 4.0 __kmpc_atomic_float4_max@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_max_cpt@VERSION 0.20130412 __kmpc_atomic_float4_min@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_min_cpt@VERSION 0.20130412 __kmpc_atomic_float4_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_float4_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float4_mul_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_rd@VERSION 0.20130412 __kmpc_atomic_float4_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_float4_sub_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_sub_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_rev_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_wr@VERSION 0.20130412 __kmpc_atomic_float8_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float8_add_fp@VERSION 0.20130412 __kmpc_atomic_float8_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_div_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_rev_fp@VERSION 4.0 __kmpc_atomic_float8_max@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_max_cpt@VERSION 0.20130412 __kmpc_atomic_float8_min@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_min_cpt@VERSION 0.20130412 __kmpc_atomic_float8_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_mul_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float8_mul_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_rd@VERSION 0.20130412 __kmpc_atomic_float8_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_cpt_fp@VERSION 4.0 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_cpt_rev_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_sub_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_sub_rev@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_wr@VERSION 0.20130412 From 5018d1a639eb6408da2526b9b47ab6d53df0df1d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 20 Mar 2024 09:23:11 +0100 Subject: [PATCH 196/302] rebase of the patch --- debian/patches/0044-soname.diff | 18 ++++---- debian/patches/D148945-revert.diff | 8 ++-- debian/patches/arm32-defaults.diff | 8 ++-- debian/patches/force-sse2-compiler-rt.diff | 8 ++-- .../patches/libclang-major-version-only.diff | 8 ++-- debian/patches/revert-update-doc.diff | 42 +++++++++---------- debian/patches/unwind-force-pthread-dl.diff | 8 ++-- .../wasm/wasm-compiler-rt-default.diff | 16 ++++--- debian/patches/wasm/wasm-ld-path.diff | 38 ++++++++--------- debian/patches/wasm/wasm-sysroot-usr.diff | 26 ++++++------ 10 files changed, 94 insertions(+), 86 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 689e95c4..8eb73bba 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-18_18.1.0-rc4/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-18_18.1.2/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-18_18.1.0-rc4.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-18_18.1.0-rc4/clang/tools/libclang/CMakeLists.txt +--- llvm-toolchain-18_18.1.2.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-18_18.1.2/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-18_18.1.0-rc4/clang/tools/libclang/CMakeLists.txt OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-18_18.1.0-rc4/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-18_18.1.2/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-18_18.1.2.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-18_18.1.2/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 + diff --git a/debian/patches/D148945-revert.diff b/debian/patches/D148945-revert.diff index 73426bdb..d5f2d952 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-18_18.1.2/clang/lib/Driver/ToolChains/Linux.cpp +=================================================================== +--- llvm-toolchain-18_18.1.2.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-18_18.1.2/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..05c879cb 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-18_18.1.2/llvm/lib/TargetParser/ARMTargetParser.cpp +=================================================================== +--- llvm-toolchain-18_18.1.2.orig/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ llvm-toolchain-18_18.1.2/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/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index 13a5e3f4..31c54a7a 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-18_18.1.2/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-18_18.1.2.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-18_18.1.2/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/libclang-major-version-only.diff b/debian/patches/libclang-major-version-only.diff index 36800f38..64486cc3 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-18_18.1.2/clang/tools/libclang/CMakeLists.txt +=================================================================== +--- llvm-toolchain-18_18.1.2.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-18_18.1.2/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/revert-update-doc.diff b/debian/patches/revert-update-doc.diff index 78cb249f..9f0c2392 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-18_18.1.2/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-18_18.1.2.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-18_18.1.2/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-18_18.1.2/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-18_18.1.2.orig/clang/docs/conf.py ++++ llvm-toolchain-18_18.1.2/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-18_18.1.2/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-18_18.1.2.orig/lld/docs/conf.py ++++ llvm-toolchain-18_18.1.2/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-18_18.1.2/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-18_18.1.2.orig/llvm/cmake/modules/AddSphinxTarget.cmake ++++ llvm-toolchain-18_18.1.2/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-18_18.1.2/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-18_18.1.2.orig/llvm/docs/conf.py ++++ llvm-toolchain-18_18.1.2/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-18_18.1.2/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-18_18.1.2.orig/polly/docs/conf.py ++++ llvm-toolchain-18_18.1.2/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/unwind-force-pthread-dl.diff b/debian/patches/unwind-force-pthread-dl.diff index 08111df4..4b2fdeaa 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-18_18.1.2/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-18_18.1.2.orig/libunwind/CMakeLists.txt ++++ llvm-toolchain-18_18.1.2/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..ec3fc0c9 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-18_18.1.2/clang/lib/Driver/ToolChains/WebAssembly.cpp +=================================================================== +--- llvm-toolchain-18_18.1.2.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-18_18.1.2/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -421,6 +421,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-18_18.1.2/clang/lib/Driver/ToolChains/WebAssembly.h +=================================================================== +--- llvm-toolchain-18_18.1.2.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-18_18.1.2/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-ld-path.diff b/debian/patches/wasm/wasm-ld-path.diff index 41789182..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_15~++20220724113059+7feab85df8e8/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== ---- 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 -@@ -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 { -@@ -68,7 +72,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; } diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff index b3bbf565..480b7443 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-18_18.1.2/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-18_18.1.2.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-18_18.1.2/clang/lib/Driver/ToolChains/WebAssembly.cpp +@@ -222,7 +222,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 +@@ -454,6 +454,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 +@@ -477,12 +478,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 { +@@ -533,6 +542,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( +@@ -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-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp } void WebAssembly::addLibStdCXXIncludePaths( -@@ -546,8 +570,11 @@ void WebAssembly::addLibStdCXXIncludePat +@@ -601,8 +625,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-18_18.1.2/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-18_18.1.2.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-18_18.1.2/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 f918e56c65223e332f6c4ad302458eb35aeeebf1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 20 Mar 2024 09:23:21 +0100 Subject: [PATCH 197/302] prepare release --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e92ad9f..1079bc88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-18 (1:18.1.1-2) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.2-1) unstable; urgency=medium [ Matthias Klose ] * Build-depend on llvm-spirv-18 instead of llvm-spirv-17. @@ -6,9 +6,10 @@ llvm-toolchain-18 (1:18.1.1-2) UNRELEASED; urgency=medium * Build with --as-needed. [ Sylvestre Ledru ] + * New upstream release * Build using mold as a linker - -- Sylvestre Ledru Sun, 17 Mar 2024 10:13:36 +0100 + -- Sylvestre Ledru Wed, 20 Mar 2024 09:20:18 +0100 llvm-toolchain-18 (1:18.1.1-1) unstable; urgency=medium From d38538d72d509475ef9cc96f1fd00e9281511d55 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 22 Mar 2024 21:24:26 +0100 Subject: [PATCH 198/302] Only install mold when used --- debian/changelog | 8 +++++++- debian/control | 2 +- debian/control.in | 2 +- debian/rules | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1079bc88..3ad6a47a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.2-2) unstable; urgency=medium + + * Only install mold when used + + -- Sylvestre Ledru Fri, 22 Mar 2024 21:24:18 +0100 + llvm-toolchain-18 (1:18.1.2-1) unstable; urgency=medium [ Matthias Klose ] @@ -9,7 +15,7 @@ llvm-toolchain-18 (1:18.1.2-1) unstable; urgency=medium * New upstream release * Build using mold as a linker - -- Sylvestre Ledru Wed, 20 Mar 2024 09:20:18 +0100 + -- Sylvestre Ledru Fri, 22 Mar 2024 21:24:08 +0100 llvm-toolchain-18 (1:18.1.1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index ce565ec3..46e825e2 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Rules-Requires-Root: no Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru , Gianfranco Costamagna Build-Depends: debhelper (>= 10.0), cmake, ninja-build, - chrpath, texinfo, sharutils, mold, + chrpath, texinfo, sharutils, libelf-dev, libffi-dev, lsb-release, patchutils, diffstat, xz-utils, python3-dev, diff --git a/debian/control.in b/debian/control.in index 85287059..04af789e 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,7 +5,7 @@ Rules-Requires-Root: no Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru , Gianfranco Costamagna Build-Depends: debhelper (>= 10.0), cmake, ninja-build, - chrpath, texinfo, sharutils, mold, + chrpath, texinfo, sharutils, libelf-dev, libffi-dev, lsb-release, patchutils, diffstat, xz-utils, python3-dev, diff --git a/debian/rules b/debian/rules index 41c7862a..00e73d2a 100755 --- a/debian/rules +++ b/debian/rules @@ -310,6 +310,7 @@ ifeq (,$(filter-out $(LIBC_DISABLE_DISTRO), $(DISTRO))) else MOLD_ENABLE=yes STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=mold + control_vars += ', mold" endif BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 From d4c37a3c41346521e09ad6ab5139b691f3797145 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 22 Mar 2024 21:47:29 +0100 Subject: [PATCH 199/302] fix the syntax --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 00e73d2a..0663e460 100755 --- a/debian/rules +++ b/debian/rules @@ -310,7 +310,7 @@ ifeq (,$(filter-out $(LIBC_DISABLE_DISTRO), $(DISTRO))) else MOLD_ENABLE=yes STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=mold - control_vars += ', mold" + control_vars += ', mold' endif BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 From 89ce97a2010e770a44423c49d84984b96a088c92 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 22 Mar 2024 22:16:14 +0100 Subject: [PATCH 200/302] show control_vars as debug --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 0663e460..7913eb94 100755 --- a/debian/rules +++ b/debian/rules @@ -634,6 +634,7 @@ stamps/preconfigure: @echo "LLVM_SPIRV=$(LLVM_SPIRV)" @echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)" @echo "DOC_GENERATION=$(DOC_GENERATION)" + @echo "control_vars=$(control_vars)" for f in debian/*.in; do \ f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ From f802896e03623908c8c65f913b0009f3be1cc2a6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 22 Mar 2024 22:20:11 +0100 Subject: [PATCH 201/302] fix the mold check --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 7913eb94..64a35c8b 100755 --- a/debian/rules +++ b/debian/rules @@ -304,7 +304,7 @@ endif # Use mold as a linker. Faster than the other. MOLD_DISABLE_DISTRO := bionic buster focal buster bullseye bookworm -ifeq (,$(filter-out $(LIBC_DISABLE_DISTRO), $(DISTRO))) +ifeq (,$(filter-out $(MOLD_DISABLE_DISTRO), $(DISTRO))) # mold is too old on this distro MOLD_ENABLE=no else From afcf07feaabe2ff563dff91c9bd919273a2776e9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 4 Apr 2024 09:22:10 +0200 Subject: [PATCH 202/302] New upstream release but disabled for now because of https://github.com/rui314/mold/issues/1224 --- debian/changelog | 6 ++++-- debian/rules | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ad6a47a..a389c517 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -llvm-toolchain-18 (1:18.1.2-2) unstable; urgency=medium +llvm-toolchain-18 (1:18.1.3-1) unstable; urgency=medium + * New upstream release * Only install mold when used + but disabled for now because of https://github.com/rui314/mold/issues/1224 - -- Sylvestre Ledru Fri, 22 Mar 2024 21:24:18 +0100 + -- Sylvestre Ledru Thu, 04 Apr 2024 07:57:13 +0200 llvm-toolchain-18 (1:18.1.2-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 64a35c8b..ec59cde0 100755 --- a/debian/rules +++ b/debian/rules @@ -307,10 +307,11 @@ MOLD_DISABLE_DISTRO := bionic buster focal buster bullseye bookworm ifeq (,$(filter-out $(MOLD_DISABLE_DISTRO), $(DISTRO))) # mold is too old on this distro MOLD_ENABLE=no -else - MOLD_ENABLE=yes - STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=mold - control_vars += ', mold' +#else +# disable mold until https://github.com/rui314/mold/issues/1224 is fixed +# MOLD_ENABLE=yes +# STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=mold +# control_vars += ', mold' endif BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 From f6f4cbdc8332fe1dc0c398904739750719e36156 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Apr 2024 18:15:04 +0200 Subject: [PATCH 203/302] New upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a389c517..18c54f6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.4-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Thu, 18 Apr 2024 11:45:22 +0200 + llvm-toolchain-18 (1:18.1.3-1) unstable; urgency=medium * New upstream release From 0692d0ed4a801a5fd8dcfb7802b89f28f662cd2f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Apr 2024 11:45:40 +0200 Subject: [PATCH 204/302] fix changelog --- debian/changelog | 1 - debian/libllvmX.Y.links.in | 1 + debian/rules | 12 ++++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 18c54f6c..b02d130a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,7 +26,6 @@ llvm-toolchain-18 (1:18.1.2-1) unstable; urgency=medium -- Sylvestre Ledru Fri, 22 Mar 2024 21:24:08 +0100 llvm-toolchain-18 (1:18.1.1-1) unstable; urgency=medium - [ Matthias Klose ] * Fix sanitizer build on 32bit time_t64 architectures. * Enable compiler-rt runtime again for 32bit time_t64 architectures. diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 56a2420d..6c7bfa20 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,4 +1,5 @@ usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 diff --git a/debian/rules b/debian/rules index ec59cde0..652bfe33 100755 --- a/debian/rules +++ b/debian/rules @@ -819,8 +819,8 @@ endif -DLIBOMP_OMPT_SUPPORT=OFF \ -DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=ON \ $(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" \ + -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=ON" \ + -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=ON" \ -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" \ @@ -850,8 +850,8 @@ endif -DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \ -DBOOTSTRAP_PYTHON_EXECUTABLE=/usr/bin/python3 \ $(BOOTSTRAP_CMAKE_EXTRA) \ - -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ - -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" + -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" \ + -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" FOUND_VERSION=`grep LLVM_VERSION_STRING build-llvm/include/llvm/Config/llvm-config.h|cut -d\" -f2`; \ if ! echo "$(LLVM_VERSION_FULL)"|grep "$$FOUND_VERSION"; then \ @@ -1176,6 +1176,10 @@ endif cp -R libunwind/include/* debian/tmp/usr/include/libunwind/; \ fi + # Rename the libLLVM library to allow co-install +# cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib; \ +# mv libLLVM.so.1 libLLVM.so.$(LLVM_VERSION).1 + : # libomp if test "$(OPENMP_ENABLE)" = yes; then \ cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib; \ From 2db840f24b556300abed9c92862c6ad762fbaece Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 23 Apr 2024 20:26:43 +0200 Subject: [PATCH 205/302] rebase of the patch --- ...e-Debian-provided-MathJax-everywhere.patch | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch index 39c2ff05..d7185877 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-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang-tools-extra/docs/doxygen.cfg.in ++++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/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,13 +40,13 @@ 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-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/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'] + html_static_path = [] +# Use Debian-provided MathJax +mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' @@ -54,13 +54,13 @@ 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-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang/docs/conf.py ++++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/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'] + html_static_path = [] +# Use Debian-provided MathJax +mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' @@ -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-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang/docs/doxygen.cfg.in ++++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d.orig/llvm/docs/doxygen.cfg.in ++++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d/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-18_18.1.0~++20240126094319+0991d3c7b53d.orig/polly/docs/doxygen.cfg.in ++++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/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. From e44ae5e5f77be183d9cfe2c808f6506424f6abe5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 23 Apr 2024 22:04:18 +0200 Subject: [PATCH 206/302] rebase of the patch --- ...e-Debian-provided-MathJax-everywhere.patch | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch index d7185877..ce62e29c 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-18_18.1.0~++20240126094319+0991d3c7b53d/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/clang-tools-extra/docs/conf.py +--- llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/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-18_18.1.0~++20240126094319+0991d3c7b53d/clang-tools-extra/ # 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-18_18.1.0~++20240126094319+0991d3c7b53d/clang-tools-extra/docs/doxygen.cfg.in +Index: llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/clang-tools-extra/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang-tools-extra/docs/doxygen.cfg.in -+++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/clang-tools-extra/docs/doxygen.cfg.in +--- llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c.orig/clang-tools-extra/docs/doxygen.cfg.in ++++ llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/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,13 +40,13 @@ Index: llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/clang-tools-extra/ # 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-18_18.1.0~++20240126094319+0991d3c7b53d/clang/docs/analyzer/conf.py +Index: llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/clang/docs/analyzer/conf.py +--- llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/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 = [] + html_static_path = ['_static'] +# Use Debian-provided MathJax +mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' @@ -54,13 +54,13 @@ Index: llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/clang/docs/analyze # 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-18_18.1.0~++20240126094319+0991d3c7b53d/clang/docs/conf.py +Index: llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/clang/docs/conf.py =================================================================== ---- llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang/docs/conf.py -+++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/clang/docs/conf.py +--- llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c.orig/clang/docs/conf.py ++++ llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/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 = [] + html_static_path = ['_static'] +# Use Debian-provided MathJax +mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' @@ -68,10 +68,10 @@ Index: llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/clang/docs/conf.py # 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-18_18.1.0~++20240126094319+0991d3c7b53d/clang/docs/doxygen.cfg.in +Index: llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/clang/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d.orig/clang/docs/doxygen.cfg.in -+++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/clang/docs/doxygen.cfg.in +--- llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c.orig/clang/docs/doxygen.cfg.in ++++ llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/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-18_18.1.0~++20240126094319+0991d3c7b53d/clang/docs/doxygen # 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-18_18.1.0~++20240126094319+0991d3c7b53d/llvm/docs/doxygen.cfg.in +Index: llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/llvm/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d.orig/llvm/docs/doxygen.cfg.in -+++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/llvm/docs/doxygen.cfg.in +--- llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c.orig/llvm/docs/doxygen.cfg.in ++++ llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/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-18_18.1.0~++20240126094319+0991d3c7b53d/llvm/docs/doxygen. # 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-18_18.1.0~++20240126094319+0991d3c7b53d/polly/docs/doxygen.cfg.in +Index: llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/polly/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d.orig/polly/docs/doxygen.cfg.in -+++ llvm-toolchain-18_18.1.0~++20240126094319+0991d3c7b53d/polly/docs/doxygen.cfg.in +--- llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c.orig/polly/docs/doxygen.cfg.in ++++ llvm-toolchain-18_18.1.5~++20240423100144+a981a4f7653c/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. From cb2bb7ab94c38366cf33436eed879224c64cf672 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Apr 2024 14:19:27 +0200 Subject: [PATCH 207/302] disable -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR --- debian/rules | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index 652bfe33..ec59cde0 100755 --- a/debian/rules +++ b/debian/rules @@ -819,8 +819,8 @@ endif -DLIBOMP_OMPT_SUPPORT=OFF \ -DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=ON \ $(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=ON" \ - -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=ON" \ + -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" \ -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" \ @@ -850,8 +850,8 @@ endif -DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \ -DBOOTSTRAP_PYTHON_EXECUTABLE=/usr/bin/python3 \ $(BOOTSTRAP_CMAKE_EXTRA) \ - -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" \ - -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" + -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ + -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" FOUND_VERSION=`grep LLVM_VERSION_STRING build-llvm/include/llvm/Config/llvm-config.h|cut -d\" -f2`; \ if ! echo "$(LLVM_VERSION_FULL)"|grep "$$FOUND_VERSION"; then \ @@ -1176,10 +1176,6 @@ endif cp -R libunwind/include/* debian/tmp/usr/include/libunwind/; \ fi - # Rename the libLLVM library to allow co-install -# cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib; \ -# mv libLLVM.so.1 libLLVM.so.$(LLVM_VERSION).1 - : # libomp if test "$(OPENMP_ENABLE)" = yes; then \ cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib; \ From 7204c780c8756378921cd14cb73d53794f81f3f6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 29 Apr 2024 11:10:52 +0200 Subject: [PATCH 208/302] Be explicit with what ships in llvm-18-linker-tools to make sure we always ships gold. Will avoid issues like: https://github.com/llvm/llvm-project/issues/87553 --- debian/changelog | 10 ++++++++++ debian/llvm-X.Y-linker-tools.install.in | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b02d130a..37be9624 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +llvm-toolchain-18 (1:18.1.4-2) unstable; urgency=medium + + * Be explicit with what ships in llvm-18-linker-tools + to make sure we always ships gold. + Will avoid issues like: + https://github.com/llvm/llvm-project/issues/87553 + Might break the build on some Debian archs. + + -- Sylvestre Ledru Mon, 29 Apr 2024 11:10:49 +0200 + llvm-toolchain-18 (1:18.1.4-1) unstable; urgency=medium * New upstream release diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in index 68af500a..202a47f8 100644 --- a/debian/llvm-X.Y-linker-tools.install.in +++ b/debian/llvm-X.Y-linker-tools.install.in @@ -1,4 +1,5 @@ #!/usr/bin/dh-exec usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.1 -[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so +[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMPolly.so +[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so From 72950dbd0f05bd9fe076535e14de522713be98f8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 29 Apr 2024 13:46:37 +0200 Subject: [PATCH 209/302] disable mold for all for now to make sure it builds gold --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index ec59cde0..9a10ad02 100755 --- a/debian/rules +++ b/debian/rules @@ -302,6 +302,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV) endif +MOLD_ENABLE=no # Use mold as a linker. Faster than the other. MOLD_DISABLE_DISTRO := bionic buster focal buster bullseye bookworm ifeq (,$(filter-out $(MOLD_DISABLE_DISTRO), $(DISTRO))) From eb889e502ada1ff3f394c7fbd15009feac8c59c8 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sat, 4 May 2024 07:33:40 +0200 Subject: [PATCH 210/302] Add ubuntu oracular as supported release --- debian/patches/series | 1 + debian/patches/ubuntu-releases.patch | 44 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 debian/patches/ubuntu-releases.patch diff --git a/debian/patches/series b/debian/patches/series index e1071e96..20e24549 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -150,3 +150,4 @@ D148945-revert.diff arm32-defaults.diff mips/D154390-pre-R6.diff libsanitizer-timebits.diff +ubuntu-releases.patch diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch new file mode 100644 index 00000000..5763c481 --- /dev/null +++ b/debian/patches/ubuntu-releases.patch @@ -0,0 +1,44 @@ +From 90bd7234e36e5b3d63155f481b739ea463985631 Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Thu, 2 May 2024 22:54:08 +0200 +Subject: [PATCH] Add support of the next Ubuntu (Ubuntu 24.10 - Oracular + Oriol) + +--- + clang/include/clang/Driver/Distro.h | 3 ++- + clang/lib/Driver/Distro.cpp | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h +index a8de94163e8b0b..1404e168684821 100644 +--- a/clang/include/clang/Driver/Distro.h ++++ b/clang/include/clang/Driver/Distro.h +@@ -79,6 +79,7 @@ class Distro { + UbuntuLunar, + UbuntuMantic, + UbuntuNoble, ++ UbuntuOracular, + UnknownDistro + }; + +@@ -130,7 +131,7 @@ class Distro { + } + + bool IsUbuntu() const { +- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble; ++ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuOracular; + } + + bool IsAlpineLinux() const { return DistroVal == AlpineLinux; } +diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp +index a7e7f169dc1419..6f49e641104ccd 100644 +--- a/clang/lib/Driver/Distro.cpp ++++ b/clang/lib/Driver/Distro.cpp +@@ -95,6 +95,7 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) { + .Case("lunar", Distro::UbuntuLunar) + .Case("mantic", Distro::UbuntuMantic) + .Case("noble", Distro::UbuntuNoble) ++ .Case("oracular", Distro::UbuntuOracular) + .Default(Distro::UnknownDistro); + return Version; + } From 98b1c19d78a2e7665af7c24075c373c4b27890cb Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sat, 4 May 2024 07:33:50 +0200 Subject: [PATCH 211/302] Update changelog, upload to sid --- debian/changelog | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 37be9624..7f6eb7c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,19 @@ -llvm-toolchain-18 (1:18.1.4-2) unstable; urgency=medium +llvm-toolchain-18 (1:18.1.5-2) unstable; urgency=medium + * Add oracular as supported release + + -- Gianfranco Costamagna Sat, 04 May 2024 07:32:59 +0200 + +llvm-toolchain-18 (1:18.1.5-1) unstable; urgency=medium + + * New upstream release * Be explicit with what ships in llvm-18-linker-tools to make sure we always ships gold. Will avoid issues like: https://github.com/llvm/llvm-project/issues/87553 Might break the build on some Debian archs. - -- Sylvestre Ledru Mon, 29 Apr 2024 11:10:49 +0200 + -- Sylvestre Ledru Fri, 03 May 2024 11:18:56 +0200 llvm-toolchain-18 (1:18.1.4-1) unstable; urgency=medium From bb4d2ae67e82539ce457f6c217487c68c068a2cf Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 8 May 2024 08:50:32 +0200 Subject: [PATCH 212/302] Add some more archs to GOLD, to fix missing LLVMgold plugin --- debian/changelog | 7 +++++++ debian/rules | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7f6eb7c7..3ae683df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.5-3) UNRELEASED; urgency=medium + + * Use gold plugin on mips64el, riscv64, loong64, sparc64 to create LLVMGold.so file + and fix a FTBFS + + -- Gianfranco Costamagna Wed, 08 May 2024 08:46:03 +0200 + llvm-toolchain-18 (1:18.1.5-2) unstable; urgency=medium * Add oracular as supported release diff --git a/debian/rules b/debian/rules index 9a10ad02..55904ee7 100755 --- a/debian/rules +++ b/debian/rules @@ -315,7 +315,7 @@ ifeq (,$(filter-out $(MOLD_DISABLE_DISTRO), $(DISTRO))) # control_vars += ', mold' 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 kfreebsd-amd64 kfreebsd-i386 riscv64 loong64 sparc64 mips64el 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))) ifeq (${MOLD_ENABLE},no) From 53a5059d58de609e74ee78346219830c7085b67f Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 8 May 2024 18:03:12 +0200 Subject: [PATCH 213/302] Revert "Add some more archs to GOLD, to fix missing LLVMgold plugin" This reverts commit bb4d2ae67e82539ce457f6c217487c68c068a2cf. --- debian/changelog | 7 ------- debian/rules | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ae683df..7f6eb7c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -llvm-toolchain-18 (1:18.1.5-3) UNRELEASED; urgency=medium - - * Use gold plugin on mips64el, riscv64, loong64, sparc64 to create LLVMGold.so file - and fix a FTBFS - - -- Gianfranco Costamagna Wed, 08 May 2024 08:46:03 +0200 - llvm-toolchain-18 (1:18.1.5-2) unstable; urgency=medium * Add oracular as supported release diff --git a/debian/rules b/debian/rules index 55904ee7..9a10ad02 100755 --- a/debian/rules +++ b/debian/rules @@ -315,7 +315,7 @@ ifeq (,$(filter-out $(MOLD_DISABLE_DISTRO), $(DISTRO))) # control_vars += ', mold' endif -BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 riscv64 loong64 sparc64 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))) ifeq (${MOLD_ENABLE},no) From 898f4588144f8ede8605b7140f8e7f64ee4b0f67 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 May 2024 09:03:16 +0200 Subject: [PATCH 214/302] Do not try to install gold on riscv64 (Closes: #1070909) Thanks to Aurelien Jarno for the fix --- debian/changelog | 7 +++++++ debian/llvm-X.Y-linker-tools.install.in | 2 +- debian/llvm-X.Y-linker-tools.links.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f6eb7c7..2630f57d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.5-3) unstable; urgency=medium + + * Do not try to install gold on riscv64 (Closes: #1070909) + Thanks to Aurelien Jarno for the fix + + -- Sylvestre Ledru Sun, 12 May 2024 09:03:09 +0200 + llvm-toolchain-18 (1:18.1.5-2) unstable; urgency=medium * Add oracular as supported release diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in index 202a47f8..973569e6 100644 --- a/debian/llvm-X.Y-linker-tools.install.in +++ b/debian/llvm-X.Y-linker-tools.install.in @@ -2,4 +2,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.1 [!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMPolly.so -[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so +[!powerpc !powerpcspe !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so diff --git a/debian/llvm-X.Y-linker-tools.links.in b/debian/llvm-X.Y-linker-tools.links.in index cbafb159..7a4a8d65 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 !powerpcspe !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so From a74dbb82624642b9ad162007b288a11ecb660b88 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Apr 2024 01:12:05 +0200 Subject: [PATCH 215/302] Disable --as-needed on armel --- debian/changelog | 6 ++++++ debian/rules | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2630f57d..d4a92a4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -531,6 +531,12 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental -- Sylvestre Ledru Sat, 28 Jan 2023 18:07:40 +0100 +llvm-toolchain-16 (1:16.0.6-26) unstable; urgency=medium + + * Disable --as-needed on armel + + -- Sylvestre Ledru Sat, 27 Apr 2024 01:12:00 +0200 + llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium [ Gianfranco Costamagna ] diff --git a/debian/rules b/debian/rules index 9a10ad02..b55ed8e5 100755 --- a/debian/rules +++ b/debian/rules @@ -86,7 +86,13 @@ include /usr/share/dpkg/buildflags.mk # collect additional flags for all stages all builds CFLAGS_EXTRA = -Wno-unused-command-line-argument CXXFLAGS_EXTRA = -Wno-unused-command-line-argument + +ifeq (,$(filter $(DEB_HOST_ARCH), armel)) LDFLAGS_EXTRA = -Wl,--build-id,--as-needed +else +# fails on armel. we are getting some missing latomic +LDFLAGS_EXTRA = -Wl,--build-id +endif # collect all flags for stage 1 toolchain build only STAGE_1_CFLAGS = $(CFLAGS) $(CFLAGS_EXTRA) $(CPPFLAGS) From 135e9ca1d25d0d86e011511eee775b959665e930 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 May 2024 09:06:02 +0200 Subject: [PATCH 216/302] Disable --as-needed on armel (Closes: #1070811) --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index d4a92a4d..28a0430c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-18 (1:18.1.5-3) unstable; urgency=medium * Do not try to install gold on riscv64 (Closes: #1070909) Thanks to Aurelien Jarno for the fix + * Disable --as-needed on armel (Closes: #1070811) -- Sylvestre Ledru Sun, 12 May 2024 09:03:09 +0200 From 0d19abfeac7cc1a41b97b54df79ec62c23365e9a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 May 2024 09:28:52 +0200 Subject: [PATCH 217/302] New upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 28a0430c..62397741 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.6-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Sun, 19 May 2024 09:27:44 +0200 + llvm-toolchain-18 (1:18.1.5-3) unstable; urgency=medium * Do not try to install gold on riscv64 (Closes: #1070909) From bf07c1c7c8505788c78457eadbea8b7e9597ab31 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 May 2024 09:31:47 +0200 Subject: [PATCH 218/302] Don't install gold on mips64el armel loong64 --- debian/changelog | 1 + debian/llvm-X.Y-linker-tools.install.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 62397741..28cb1041 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-18 (1:18.1.6-1) unstable; urgency=medium * New upstream release + * Don't install gold on mips64el armel loong64 -- Sylvestre Ledru Sun, 19 May 2024 09:27:44 +0200 diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in index 973569e6..d4b11758 100644 --- a/debian/llvm-X.Y-linker-tools.install.in +++ b/debian/llvm-X.Y-linker-tools.install.in @@ -2,4 +2,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.1 [!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMPolly.so -[!powerpc !powerpcspe !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so +[!powerpc !powerpcspe !riscv64 !mips64el !armel !loong64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so From 1a6ec19234e98531b24f36773ccde900a780cbbf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 May 2024 10:06:37 +0200 Subject: [PATCH 219/302] qualify-clang.sh : check for the output --- debian/qualify-clang.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 85702754..c2b3a57c 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1059,7 +1059,16 @@ clang++-$VERSION -std=c++20 \ # The output should be # Hello modular world # Hello compat modular world -./a.out +./a.out > foo.log + +if ! grep -q -E "Hello modular world" foo.log 2>&1; then + echo "c++ modules didn't work" + exit 1 +fi +if ! grep -q -E "Hello compat modular world" foo.log 2>&1; then + echo "c++ modules didn't work" + exit 1 +fi if test ! -f /usr/lib/llvm-$VERSION/include/cxxabi.h; then echo "Install libc++abi-$VERSION-dev"; From 1d4a399ab77e0d61fbe2efea12b7088dc603a7f0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 May 2024 10:07:26 +0200 Subject: [PATCH 220/302] qualify-clang.sh: recreate a C++ file without modules --- debian/qualify-clang.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index c2b3a57c..8b59b99e 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1075,6 +1075,10 @@ if test ! -f /usr/lib/llvm-$VERSION/include/cxxabi.h; then exit -1; fi +# Recreate a C++ without modules +echo '#include +int main() { }' > foo.cpp + # Force the usage of libc++abi clang++-$VERSION -stdlib=libc++ -lc++abi foo.cpp -o o ./o > /dev/null From 2e8e38c7453c1866b7496f6b7065bb2068869002 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 May 2024 10:07:42 +0200 Subject: [PATCH 221/302] qualify-clang.sh: cosmetic --- 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 8b59b99e..341b1641 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1082,7 +1082,7 @@ int main() { }' > foo.cpp # Force the usage of libc++abi clang++-$VERSION -stdlib=libc++ -lc++abi foo.cpp -o o ./o > /dev/null -if ! ldd o 2>&1|grep -q libc++abi.so.1; then +if ! ldd o 2>&1|grep -q libc++abi.so.1; then echo "not linked against libc++abi.so.1" exit -1 fi From d8735edaabc1417b29fe471bf61412d8573dfc30 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 May 2024 10:08:24 +0200 Subject: [PATCH 222/302] Unbreak autopkgtest --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 28cb1041..bbfbc314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-18 (1:18.1.6-1) unstable; urgency=medium * New upstream release * Don't install gold on mips64el armel loong64 + * Unbreak autopkgtest -- Sylvestre Ledru Sun, 19 May 2024 09:27:44 +0200 From 0a1a90fdd04d9f4b14817f5ade527eb307ebaa0a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 May 2024 10:09:33 +0200 Subject: [PATCH 223/302] qualify-clang.sh: remove all files --- debian/qualify-clang.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 341b1641..cf75b4c1 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1836,5 +1836,6 @@ fi #clean up rm -f a.out bar crash-* foo foo.* lldb-cmd.txt main.* test_fuzzer.cc foo.* o rm -rf output matmul.* *profraw opt.ll a.json default.profdata test test.cpp +rm -f foo-foo.gc* hello_world.mod lib.f90 std*.pcm echo "Completed" From 212ecd5e0f65b89f91ae38d2f29461a79fac0f61 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 23 May 2024 11:48:56 +0200 Subject: [PATCH 224/302] 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 cf75b4c1..f8b0b62e 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1247,7 +1247,7 @@ end program main' > foo.f90 fi rm -f foo.log foo.f90 foo libflib.so else - echo "Skipping esting flang-$VERSION (Fortran) ..." + echo "Skipping testing flang-$VERSION (Fortran) ..." echo "doesn't exist on this arch" fi From d5a73bd2c9551571084ccecf4307ef94e0b75d96 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 23 May 2024 11:49:00 +0200 Subject: [PATCH 225/302] autopkgtest: only run libllvmlibc test on supported archs --- debian/changelog | 6 ++++++ debian/qualify-clang.sh | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bbfbc314..0f40f7f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.6-2) unstable; urgency=medium + + * autopkgtest: only run libllvmlibc test on supported archs + + -- + llvm-toolchain-18 (1:18.1.6-1) unstable; urgency=medium * New upstream release diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index f8b0b62e..97829ee8 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1252,7 +1252,8 @@ else fi # libc -echo "Testing llvmlibc-$VERSION-dev ..." +if dpkg -l|grep -q libllvmlibc-$VERSION-dev; then +echo "Testing libllvmlibc-$VERSION-dev ..." echo ' #include int main(void) @@ -1287,6 +1288,10 @@ fi BINDIR=$(llvm-config-$VERSION --bindir) /usr/lib/llvm-$VERSION/share/libclc/check_external_calls.sh /usr/lib/clc/amdgcn--amdhsa.bc $BINDIR > /dev/null +else + echo "Skipping testing libllvmlibc-$VERSION-dev ..." + echo "doesn't exist on this arch" +fi # libunwind echo "Testing libunwind-$VERSION-dev ..." From c883ce783266e2040aaac442f4c2ab932be3ba8d Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 31 May 2024 10:41:46 +0200 Subject: [PATCH 226/302] Don't install Gold plugin on sparc64 --- debian/changelog | 5 +++-- debian/llvm-X.Y-linker-tools.install.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0f40f7f1..030eacd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -llvm-toolchain-18 (1:18.1.6-2) unstable; urgency=medium +llvm-toolchain-18 (1:18.1.6-2) UNRELEASED; urgency=medium * autopkgtest: only run libllvmlibc test on supported archs + * Don't install Gold plugin on sparc64 - -- + -- John Paul Adrian Glaubitz Fri, 31 May 2024 10:40:10 +0200 llvm-toolchain-18 (1:18.1.6-1) unstable; urgency=medium diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in index d4b11758..2f300a0d 100644 --- a/debian/llvm-X.Y-linker-tools.install.in +++ b/debian/llvm-X.Y-linker-tools.install.in @@ -2,4 +2,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.1 [!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMPolly.so -[!powerpc !powerpcspe !riscv64 !mips64el !armel !loong64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so +[!powerpc !powerpcspe !riscv64 !mips64el !armel !loong64 !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so From 724b11d928176fb09522539e4b39d69de4969a8b Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 31 May 2024 12:30:25 +0200 Subject: [PATCH 227/302] Fix missing authorship information in debian/changelog --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 030eacd0..e2da7d9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ llvm-toolchain-18 (1:18.1.6-2) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * autopkgtest: only run libllvmlibc test on supported archs + + [ John Paul Adrian Glaubitz ] * Don't install Gold plugin on sparc64 -- John Paul Adrian Glaubitz Fri, 31 May 2024 10:40:10 +0200 From e3fa3a22b5f497cefeb5f8317ab6cc1b212a0fac Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 1 Jun 2024 21:29:43 +0200 Subject: [PATCH 228/302] Disable LLVM testsuite on x32 --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2da7d9e..13e59062 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-18 (1:18.1.6-2) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Don't install Gold plugin on sparc64 + * Disable LLVM testsuite on x32 -- John Paul Adrian Glaubitz Fri, 31 May 2024 10:40:10 +0200 diff --git a/debian/rules b/debian/rules index b55ed8e5..ef8e87a1 100755 --- a/debian/rules +++ b/debian/rules @@ -414,8 +414,8 @@ ifeq (riscv64,$(DEB_HOST_ARCH)) endif endif -# llvm tests timeout, disable it on mips64el -ifeq (mips64el,$(DEB_HOST_ARCH)) +# llvm tests timeout, disable it on mips64el and x32 +ifneq (,$(filter $(DEB_HOST_ARCH),mips64el x32)) RUN_TEST=no endif From b3c2e27641a9a70112dd12731523155756422e34 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 1 Jun 2024 21:39:01 +0200 Subject: [PATCH 229/302] 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 13e59062..08f31e15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-18 (1:18.1.6-2) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Don't install Gold plugin on sparc64 * Disable LLVM testsuite on x32 + * Install liborc_rt-x86_64.a on x32 -- John Paul Adrian Glaubitz Fri, 31 May 2024 10:40:10 +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 f9f606c59d894cddad18c6a2ee34ad32b0109f68 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 1 Jun 2024 23:21:58 +0200 Subject: [PATCH 230/302] 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 08f31e15..09c75c4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ llvm-toolchain-18 (1:18.1.6-2) UNRELEASED; urgency=medium * Don't install Gold plugin on sparc64 * Disable LLVM testsuite on x32 * Install liborc_rt-x86_64.a on x32 + * Install hwasan_symbolize on x32 -- John Paul Adrian Glaubitz Fri, 31 May 2024 10:40:10 +0200 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 1394605f..3b829b49 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 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 c4fe55e3c5d956eeed622157f86a469673e7553b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 2 Jun 2024 12:38:48 +0200 Subject: [PATCH 231/302] refresh the list of symbols --- debian/libclang1-X.Y.symbols.in | 3 +++ debian/libomp5-X.Y.symbols.in | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in index 8b611085..bcf0dc83 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Y.symbols.in @@ -1,4 +1,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER# + LLVM_13@LLVM_13 1:18 + LLVM_16@LLVM_16 1:18 + LLVM_17@LLVM_17 1:18 clang_BlockCommandComment_getArgText@LLVM_13 1:5.0~svn298832-1~ clang_BlockCommandComment_getCommandName@LLVM_13 1:5.0~svn298832-1~ clang_BlockCommandComment_getNumArgs@LLVM_13 1:5.0~svn298832-1~ diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in index 1c77b560..6930ffc2 100644 --- a/debian/libomp5-X.Y.symbols.in +++ b/debian/libomp5-X.Y.symbols.in @@ -1,4 +1,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# + GOMP_1.0@GOMP_1.0 18 + GOMP_2.0@GOMP_2.0 18 + GOMP_3.0@GOMP_3.0 18 + GOMP_4.0@GOMP_4.0 18 + GOMP_4.5@GOMP_4.5 18 + GOMP_5.0.1@GOMP_5.0.1 18 + GOMP_5.0@GOMP_5.0 18 GOMP_alloc@GOMP_5.0.1 14 GOMP_alloc@VERSION 14 GOMP_atomic_end@GOMP_1.0 0.20131209 @@ -255,6 +262,14 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# GOMP_teams_reg@VERSION 12 GOMP_workshare_task_reduction_unregister@GOMP_5.0 13 GOMP_workshare_task_reduction_unregister@VERSION 13 + OMP_1.0@OMP_1.0 18 + OMP_2.0@OMP_2.0 18 + OMP_3.0@OMP_3.0 18 + OMP_3.1@OMP_3.1 18 + OMP_4.0@OMP_4.0 18 + OMP_4.5@OMP_4.5 18 + OMP_5.0@OMP_5.0 18 + VERSION@VERSION 18 ___kmp_allocate@VERSION 0.20130412 ___kmp_free@VERSION 0.20130412 __kmp_acquire_drdpa_lock@VERSION 0.20130715 @@ -1166,6 +1181,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# ompt_libomp_connect@VERSION 17 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)ompt_start_tool@VERSION 6.0 libomptarget.rtl.amdgpu.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# + VERS1.0@VERS1.0 18 __tgt_rtl_create_event@VERS1.0 18 __tgt_rtl_data_alloc@VERS1.0 18 __tgt_rtl_data_delete@VERS1.0 18 @@ -1204,6 +1220,7 @@ libomptarget.rtl.amdgpu.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_use_auto_zero_copy@VERS1.0 18 __tgt_rtl_wait_event@VERS1.0 18 libomptarget.rtl.cuda.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# + VERS1.0@VERS1.0 18 __tgt_rtl_create_event@VERS1.0 18 __tgt_rtl_data_alloc@VERS1.0 18 __tgt_rtl_data_delete@VERS1.0 18 @@ -1242,6 +1259,7 @@ libomptarget.rtl.cuda.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_use_auto_zero_copy@VERS1.0 18 __tgt_rtl_wait_event@VERS1.0 18 libomptarget.rtl.x86_64.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# + VERS1.0@VERS1.0 18 __tgt_rtl_create_event@VERS1.0 18 __tgt_rtl_data_alloc@VERS1.0 18 __tgt_rtl_data_delete@VERS1.0 18 @@ -1280,6 +1298,7 @@ libomptarget.rtl.x86_64.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# __tgt_rtl_use_auto_zero_copy@VERS1.0 18 __tgt_rtl_wait_event@VERS1.0 18 libomptarget.so.@LLVM_VERSION@.1 libomp5-@LLVM_VERSION@ #MINVER# + VERS1.0@VERS1.0 18 __kmpc_push_target_tripcount@VERS1.0 18 __kmpc_push_target_tripcount_mapper@VERS1.0 18 __tgt_activate_record_replay@VERS1.0 18 From 9ca35f30383d89e4fdd45d15e0eb82c832df4b8c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 2 Jun 2024 13:02:29 +0200 Subject: [PATCH 232/302] Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR to move the libraries into multi archi directories (Closes: #1067699, #1067005) (LP: #2063207) --- debian/changelog | 8 ++++++-- debian/libc++-X.Y-dev.install.in | 10 +++++----- debian/libc++1-X.Y.install.in | 2 +- debian/libc++abi-X.Y-dev.install.in | 4 ++-- debian/libc++abi1-X.Y.install.in | 2 +- debian/libllvmlibc-X.Y-dev.install.in | 2 +- debian/libunwind-X.Y-dev.install.in | 4 ++-- debian/libunwind-X.Y.install.in | 2 +- debian/qualify-clang.sh | 21 ++++++++++++++------- debian/rules | 24 +++++++++++++++++------- 10 files changed, 50 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09c75c4d..3a9981dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ -llvm-toolchain-18 (1:18.1.6-2) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.6-2~exp1) experimental; urgency=medium [ Sylvestre Ledru ] + * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR + to move the libraries into multi archi directories + (Closes: #1067699, #1067005) + (LP: #2063207) * autopkgtest: only run libllvmlibc test on supported archs [ John Paul Adrian Glaubitz ] @@ -9,7 +13,7 @@ llvm-toolchain-18 (1:18.1.6-2) UNRELEASED; urgency=medium * Install liborc_rt-x86_64.a on x32 * Install hwasan_symbolize on x32 - -- John Paul Adrian Glaubitz Fri, 31 May 2024 10:40:10 +0200 + -- Sylvestre Ledru Fri, 31 May 2024 23:00:43 +0200 llvm-toolchain-18 (1:18.1.6-1) unstable; urgency=medium diff --git a/debian/libc++-X.Y-dev.install.in b/debian/libc++-X.Y-dev.install.in index 1a4d26ee..8099a083 100644 --- a/debian/libc++-X.Y-dev.install.in +++ b/debian/libc++-X.Y-dev.install.in @@ -1,11 +1,11 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so -usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.so +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 +usr/lib/llvm-@LLVM_VERSION@/include/*/c++/v1/ +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++experimental.a # C++ modules -usr/lib/llvm-@LLVM_VERSION@/lib/libc++.modules.json +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/libc++1-X.Y.install.in b/debian/libc++1-X.Y.install.in index 78e2cd3b..606c7fcf 100644 --- a/debian/libc++1-X.Y.install.in +++ b/debian/libc++1-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.so.* diff --git a/debian/libc++abi-X.Y-dev.install.in b/debian/libc++abi-X.Y-dev.install.in index 8774c6ae..ce71f3e6 100644 --- a/debian/libc++abi-X.Y-dev.install.in +++ b/debian/libc++abi-X.Y-dev.install.in @@ -1,3 +1,3 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi*so -usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi*so +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi.a libcxxabi/include/* usr/lib/llvm-@LLVM_VERSION@/include/ diff --git a/debian/libc++abi1-X.Y.install.in b/debian/libc++abi1-X.Y.install.in index 6e27733d..a7e1c070 100644 --- a/debian/libc++abi1-X.Y.install.in +++ b/debian/libc++abi1-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi.so.* diff --git a/debian/libllvmlibc-X.Y-dev.install.in b/debian/libllvmlibc-X.Y-dev.install.in index cd6c1add..e8fe2fc3 100644 --- a/debian/libllvmlibc-X.Y-dev.install.in +++ b/debian/libllvmlibc-X.Y-dev.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libllvmlibc.a +usr/lib/llvm-@LLVM_VERSION@/lib/*/libllvmlibc.a diff --git a/debian/libunwind-X.Y-dev.install.in b/debian/libunwind-X.Y-dev.install.in index f22f67f2..f01f1bb5 100644 --- a/debian/libunwind-X.Y-dev.install.in +++ b/debian/libunwind-X.Y-dev.install.in @@ -1,5 +1,5 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.a +usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.so +usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.a usr/include/libunwind usr/lib/llvm-@LLVM_VERSION@/include/*unwind* usr/lib/llvm-@LLVM_VERSION@/include/mach-o/ diff --git a/debian/libunwind-X.Y.install.in b/debian/libunwind-X.Y.install.in index e26306e4..9857c78a 100644 --- a/debian/libunwind-X.Y.install.in +++ b/debian/libunwind-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.so.* diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 97829ee8..ca9b1d92 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -8,6 +8,7 @@ fi 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) +ARCH=$(clang-$VERSION -dumpmachine) 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}_amd64.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 " @@ -472,8 +473,8 @@ echo "Testing linking clang-cpp ..." clang-$VERSION -lclang-cpp$VERSION -v foo.cpp -o o &> /dev/null || true if ! ldd o 2>&1|grep -q libclang-cpp; then - echo "Didn't link against libclang-cpp$VERSION" - exit 42 + echo "Didn't link against libclang-cpp$VERSION" + exit 42 fi ./o > /dev/null @@ -942,7 +943,7 @@ if test ! -f /usr/lib/llvm-$VERSION/include/c++/v1/vector; then exit -1; fi -if test ! -f /usr/lib/llvm-$VERSION/lib/libc++abi.so; then +if test ! -f /usr/lib/llvm-$VERSION/lib/$ARCH/libc++abi.so; then echo "Install libc++abi-$VERSION-dev"; exit -1; fi @@ -1029,7 +1030,8 @@ EOF # Builds the std module clang++-$VERSION -std=c++20 \ -nostdinc++ \ - -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ --precompile -o std.pcm \ -c /usr/lib/llvm-$VERSION/share/libc++/v1/std.cppm @@ -1037,7 +1039,8 @@ clang++-$VERSION -std=c++20 \ # Builds the std.compat module clang++-$VERSION -std=c++20 \ -nostdinc++ \ - -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ --precompile -o std.compat.pcm \ -fmodule-file=std=std.pcm \ @@ -1146,7 +1149,8 @@ int main(void) clang-$VERSION -Wconversion -Werror foo.c &> /dev/null || true if test -f /usr/bin/g++; then -g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -L/usr/lib/llvm-$VERSION/lib/ \ +g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -I/usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ + -L/usr/lib/llvm-$VERSION/lib/ \ foo.cpp -nodefaultlibs -std=c++17 -lc++ -lc++abi -lm -lc -lgcc_s -lgcc|| true ./o > /dev/null fi @@ -1166,6 +1170,7 @@ EOF clang-$VERSION -std=c++20 \ -nostdinc++ \ -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ --precompile -o std.pcm \ -c /usr/lib/llvm-$VERSION/share/libc++/v1/std.cppm @@ -1174,6 +1179,7 @@ clang-$VERSION -std=c++20 \ clang-$VERSION -std=c++20 \ -nostdinc++ \ -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ --precompile -o std.compat.pcm \ -fmodule-file=std=std.pcm \ @@ -1183,6 +1189,7 @@ clang-$VERSION -std=c++20 \ clang-$VERSION -std=c++20 \ -nostdinc++ \ -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ -L /usr/lib/llvm-$VERSION/lib \ -fmodule-file=std=std.pcm \ -fmodule-file=std.compat=std.compat.pcm \ @@ -1406,7 +1413,7 @@ int main(int, char**) { return -2; } '> foo.cpp -clang++-$VERSION foo.cpp /usr/lib/llvm-$VERSION/lib/libunwind.a -I/usr/include/libunwind/ -lpthread -ldl +clang++-$VERSION foo.cpp /usr/lib/llvm-$VERSION/lib/$ARCH/libunwind.a -I/usr/include/libunwind/ -lpthread -ldl ./a.out||true clang++-$VERSION foo.cpp -unwindlib=libunwind -rtlib=compiler-rt -I/usr/include/libunwind -ldl ./a.out||true diff --git a/debian/rules b/debian/rules index ef8e87a1..572a5f38 100755 --- a/debian/rules +++ b/debian/rules @@ -826,8 +826,8 @@ endif -DLIBOMP_OMPT_SUPPORT=OFF \ -DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=ON \ $(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" \ + -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=ON" \ + -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=ON" \ -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" \ @@ -857,8 +857,8 @@ endif -DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \ -DBOOTSTRAP_PYTHON_EXECUTABLE=/usr/bin/python3 \ $(BOOTSTRAP_CMAKE_EXTRA) \ - -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ - -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" + -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" \ + -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" FOUND_VERSION=`grep LLVM_VERSION_STRING build-llvm/include/llvm/Config/llvm-config.h|cut -d\" -f2`; \ if ! echo "$(LLVM_VERSION_FULL)"|grep "$$FOUND_VERSION"; then \ @@ -1174,7 +1174,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/*/*.so endif endif @@ -1382,7 +1382,9 @@ override_dh_makeshlibs: override_dh_shlibdeps: # Ignore asan libraries. They would trigger dependencies to multiarch libraries - dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so + TRIPLE_CLANG_ARCH=`debian/tmp/usr/bin/clang-$(LLVM_VERSION) -dumpmachine`; \ + echo "TRIPLE_CLANG_ARCH = $$TRIPLE_CLANG_ARCH"; \ + dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/$$TRIPLE_CLANG_ARCH/ -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so override_dh_installman: if test -f lld/docs/ld.lld.1; then \ @@ -1433,7 +1435,9 @@ override_dh_install: ifeq (${POLLY_ENABLE},yes) # only for arch:any builds ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(packages))) - dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly + if test -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/PollyConfig.cmake; then \ + dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly; \ + fi # On old Debian & Ubuntu, removing the files is necessary rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake else @@ -1444,6 +1448,12 @@ endif # 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))) +# Keep only one copy of the wasm files + rm -rf \ + $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/ \ + $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/wasm32-wasi/ \ + $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/wasm32-wasi/ + mkdir -p $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1 if test -f $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h; then \ mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h \ From 6ef30e36a7ff9c6f77cc890feaccf52c8e3554ce Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 2 Jun 2024 10:43:16 +0200 Subject: [PATCH 233/302] Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system because the LLVM triple is different than Debian x86_64-pc-linux-gnu instead of x86_64-linux-gnu --- debian/changelog | 11 +++++++++++ debian/libc++1-X.Y.links.in | 2 +- debian/libc++abi1-X.Y.links.in | 2 +- debian/libunwind-X.Y-dev.links.in | 4 ++-- debian/libunwind-X.Y.links.in | 2 +- debian/qualify-clang.sh | 2 +- debian/rules | 3 +++ 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a9981dc..25b8cca4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-18 (1:18.1.6-2~exp1) experimental; urgency=medium +<<<<<<< [ Sylvestre Ledru ] * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR to move the libraries into multi archi directories @@ -12,6 +13,16 @@ llvm-toolchain-18 (1:18.1.6-2~exp1) experimental; urgency=medium * Disable LLVM testsuite on x32 * Install liborc_rt-x86_64.a on x32 * Install hwasan_symbolize on x32 +======= + * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR + to move the libraries into multi archi directories + (Closes: #1067699, #1067005) + (LP: #2063207) + * Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system + because the LLVM triple is different than Debian + x86_64-pc-linux-gnu instead of x86_64-linux-gnu + * autopkgtest: only run libllvmlibc test on supported archs +>>>>>>> -- Sylvestre Ledru Fri, 31 May 2024 23:00:43 +0200 diff --git a/debian/libc++1-X.Y.links.in b/debian/libc++1-X.Y.links.in index 4d1955c5..1e34d1d4 100644 --- a/debian/libc++1-X.Y.links.in +++ b/debian/libc++1-X.Y.links.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 +usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1 diff --git a/debian/libc++abi1-X.Y.links.in b/debian/libc++abi1-X.Y.links.in index a57ef065..8d706053 100644 --- a/debian/libc++abi1-X.Y.links.in +++ b/debian/libc++abi1-X.Y.links.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 +usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1 diff --git a/debian/libunwind-X.Y-dev.links.in b/debian/libunwind-X.Y-dev.links.in index d6d6103a..e00c7d14 100644 --- a/debian/libunwind-X.Y-dev.links.in +++ b/debian/libunwind-X.Y-dev.links.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.a /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.a +usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so +usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.a /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.a diff --git a/debian/libunwind-X.Y.links.in b/debian/libunwind-X.Y.links.in index 2c8a964b..530f3966 100644 --- a/debian/libunwind-X.Y.links.in +++ b/debian/libunwind-X.Y.links.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0 +usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0 usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1 diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index ca9b1d92..007b7d56 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -8,7 +8,6 @@ fi 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) -ARCH=$(clang-$VERSION -dumpmachine) 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}_amd64.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 " @@ -280,6 +279,7 @@ rm -rf cmaketest echo "Testing clang-$VERSION ..." +ARCH=$(clang-$VERSION -dumpmachine) rm -f foo.log echo 'int main() {return 0;}' > foo.c diff --git a/debian/rules b/debian/rules index 572a5f38..31de2baf 100755 --- a/debian/rules +++ b/debian/rules @@ -866,6 +866,9 @@ endif exit 1; \ fi @mkdir -p stamps +# Detect the triple + TRIPLE=`grep LLVM_DEFAULT_TARGET_TRIPLE build-llvm/CMakeCache.txt|cut -d= -f2`; \ + sed -i -e "s|@DEB_HOST_MULTIARCH_LLVM@|$$TRIPLE|g" debian/*.links touch $@ VERBOSE=-v From 0859c35d2491709caf51272b9f19648ae3c9eef0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 2 Jun 2024 13:05:38 +0200 Subject: [PATCH 234/302] fix conflict --- debian/changelog | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25b8cca4..5e454f05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,19 +1,6 @@ llvm-toolchain-18 (1:18.1.6-2~exp1) experimental; urgency=medium -<<<<<<< [ Sylvestre Ledru ] - * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR - to move the libraries into multi archi directories - (Closes: #1067699, #1067005) - (LP: #2063207) - * autopkgtest: only run libllvmlibc test on supported archs - - [ John Paul Adrian Glaubitz ] - * Don't install Gold plugin on sparc64 - * Disable LLVM testsuite on x32 - * Install liborc_rt-x86_64.a on x32 - * Install hwasan_symbolize on x32 -======= * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR to move the libraries into multi archi directories (Closes: #1067699, #1067005) @@ -22,7 +9,12 @@ llvm-toolchain-18 (1:18.1.6-2~exp1) experimental; urgency=medium because the LLVM triple is different than Debian x86_64-pc-linux-gnu instead of x86_64-linux-gnu * autopkgtest: only run libllvmlibc test on supported archs ->>>>>>> + + [ John Paul Adrian Glaubitz ] + * Don't install Gold plugin on sparc64 + * Disable LLVM testsuite on x32 + * Install liborc_rt-x86_64.a on x32 + * Install hwasan_symbolize on x32 -- Sylvestre Ledru Fri, 31 May 2024 23:00:43 +0200 From 1d5c011bd352cb2330fc989e338e1770863b06e4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 4 Jun 2024 10:25:58 +0200 Subject: [PATCH 235/302] qualify-clang.sh: add a check to make sure that libllvm is still co installable --- debian/qualify-clang.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 007b7d56..5bffb0b0 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -30,6 +30,12 @@ if test ! -f /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so; then exit 1 fi +if test -f /usr/lib/llvm-$VERSION/lib/libLLVM.so; then + echo "/usr/lib/llvm-$VERSION/lib/libLLVM.so found." + echo "Break the build as it breaks the coinstalability" + exit 1 +fi + echo "Testing llvm-$VERSION and llvm-$VERSION-dev ..." llvm-config-$VERSION --link-shared --libs &> /dev/null From 92d36668ed7f1fcee34dca6c3d0862f2e09bc241 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 14 Jun 2024 13:19:16 +0200 Subject: [PATCH 236/302] New upstream release --- debian/changelog | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5e454f05..acd11fb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,22 +1,8 @@ -llvm-toolchain-18 (1:18.1.6-2~exp1) experimental; urgency=medium +llvm-toolchain-18 (1:18.1.7-1) unstable; urgency=medium - [ Sylvestre Ledru ] - * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR - to move the libraries into multi archi directories - (Closes: #1067699, #1067005) - (LP: #2063207) - * Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system - because the LLVM triple is different than Debian - x86_64-pc-linux-gnu instead of x86_64-linux-gnu - * autopkgtest: only run libllvmlibc test on supported archs + * New upstream release - [ John Paul Adrian Glaubitz ] - * Don't install Gold plugin on sparc64 - * Disable LLVM testsuite on x32 - * Install liborc_rt-x86_64.a on x32 - * Install hwasan_symbolize on x32 - - -- Sylvestre Ledru Fri, 31 May 2024 23:00:43 +0200 + -- Sylvestre Ledru Fri, 14 Jun 2024 10:14:20 +0200 llvm-toolchain-18 (1:18.1.6-1) unstable; urgency=medium From 21fa7e923a516a966202312904a34962009bd710 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 14 Jun 2024 13:19:29 +0200 Subject: [PATCH 237/302] prepare a new release --- debian/changelog | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index acd11fb3..60d37106 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +llvm-toolchain-18 (1:18.1.7-1~exp1) experimental; urgency=medium + + [ Sylvestre Ledru ] + * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR + to move the libraries into multi archi directories + (Closes: #1067699, #1067005) + (LP: #2063207) + * Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system + because the LLVM triple is different than Debian + x86_64-pc-linux-gnu instead of x86_64-linux-gnu + * autopkgtest: only run libllvmlibc test on supported archs + + [ John Paul Adrian Glaubitz ] + * Don't install Gold plugin on sparc64 + * Disable LLVM testsuite on x32 + * Install liborc_rt-x86_64.a on x32 + * Install hwasan_symbolize on x32 + + -- Sylvestre Ledru Fri, 14 Jun 2024 13:18:40 +0200 + llvm-toolchain-18 (1:18.1.7-1) unstable; urgency=medium * New upstream release From 6f43ce8df4303919e324360e2f48d670a1611234 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 14 Jun 2024 14:57:29 +0200 Subject: [PATCH 238/302] fix liborc --- debian/libclang-rt-X.Y-dev.install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index b8248b56..4946d9d2 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 x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* +[amd64 arm64 armhf armel i386 ppc64 ppc64el] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/liborc_rt* From 4cf15e66711010d2c01fe59ed46522e9c6317922 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 22 Jun 2024 12:18:57 +0200 Subject: [PATCH 239/302] 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 --- debian/changelog | 7 +++++++ debian/control | 16 ++++++++-------- debian/control.in | 16 ++++++++-------- debian/rules | 2 +- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 60d37106..52686ccc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.7-1~exp2) UNRELEASED; urgency=medium + + [ Aurelien Jarno ] + * Enable lldb on riscv64. + + -- Aurelien Jarno Sat, 22 Jun 2024 12:18:16 +0200 + llvm-toolchain-18 (1:18.1.7-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/control b/debian/control index 46e825e2..c90d3363 100644 --- a/debian/control +++ b/debian/control @@ -562,8 +562,8 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-18 -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}, libllvm18 (= ${binary:Version}), python3-lldb-18 Pre-Depends: ${misc:Pre-Depends} @@ -574,8 +574,8 @@ Description: Next generation, high-performance debugger Package: liblldb-18 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}, libllvm18 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -588,8 +588,8 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-18 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-18 (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -604,8 +604,8 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-18-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-18 (= ${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 04af789e..a8506043 100644 --- a/debian/control.in +++ b/debian/control.in @@ -562,8 +562,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} @@ -574,8 +574,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 @@ -588,8 +588,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 @@ -604,8 +604,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 31de2baf..07879c0d 100755 --- a/debian/rules +++ b/debian/rules @@ -453,7 +453,7 @@ else endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64 mips64el mipsel +LLDB_DISABLE_ARCHS := 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 8d8cb00fdd380fb38936e1ce84c10cad645f51d3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 1 Jul 2024 22:27:43 +0200 Subject: [PATCH 240/302] fix changelog --- debian/changelog | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52686ccc..535fe213 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,4 @@ -llvm-toolchain-18 (1:18.1.7-1~exp2) UNRELEASED; urgency=medium - - [ Aurelien Jarno ] - * Enable lldb on riscv64. - - -- Aurelien Jarno Sat, 22 Jun 2024 12:18:16 +0200 - -llvm-toolchain-18 (1:18.1.7-1~exp1) experimental; urgency=medium +llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium [ Sylvestre Ledru ] * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR @@ -23,7 +16,20 @@ llvm-toolchain-18 (1:18.1.7-1~exp1) experimental; urgency=medium * Install liborc_rt-x86_64.a on x32 * Install hwasan_symbolize on x32 - -- Sylvestre Ledru Fri, 14 Jun 2024 13:18:40 +0200 + -- Sylvestre Ledru Mon, 01 Jul 2024 22:27:25 +0200 + +llvm-toolchain-18 (1:18.1.8-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Fri, 21 Jun 2024 22:00:49 +0200 + +llvm-toolchain-18 (1:18.1.7-1~exp2) UNRELEASED; urgency=medium + + [ Aurelien Jarno ] + * Enable lldb on riscv64. + + -- Aurelien Jarno Sat, 22 Jun 2024 12:18:16 +0200 llvm-toolchain-18 (1:18.1.7-1) unstable; urgency=medium @@ -31,6 +37,12 @@ llvm-toolchain-18 (1:18.1.7-1) unstable; urgency=medium -- Sylvestre Ledru Fri, 14 Jun 2024 10:14:20 +0200 +llvm-toolchain-18 (1:18.1.7~++20240605091817+7e6ece9b4f2d-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + + -- Sylvestre Ledru Wed, 05 Jun 2024 09:18:34 +0200 + llvm-toolchain-18 (1:18.1.6-1) unstable; urgency=medium * New upstream release @@ -64,6 +76,12 @@ llvm-toolchain-18 (1:18.1.5-1) unstable; urgency=medium -- Sylvestre Ledru Fri, 03 May 2024 11:18:56 +0200 +llvm-toolchain-18 (1:18.1.5~++20240430100627+f341c76b9461-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + + -- Sylvestre Ledru Tue, 30 Apr 2024 10:06:39 +0200 + llvm-toolchain-18 (1:18.1.4-1) unstable; urgency=medium * New upstream release From b9b2b31da9de5931b3fce4d344867bca58d40310 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 1 Jul 2024 23:14:54 +0200 Subject: [PATCH 241/302] fix changelog --- debian/changelog | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 535fe213..a7eb6de0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,12 @@ llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium * Install liborc_rt-x86_64.a on x32 * Install hwasan_symbolize on x32 + [ Norbert Lange ] + * build lldb with Intel PT support on x86, amd64 + + [ Aurelien Jarno ] + * Enable lldb on riscv64. + -- Sylvestre Ledru Mon, 01 Jul 2024 22:27:25 +0200 llvm-toolchain-18 (1:18.1.8-1) unstable; urgency=medium @@ -24,13 +30,6 @@ llvm-toolchain-18 (1:18.1.8-1) unstable; urgency=medium -- Sylvestre Ledru Fri, 21 Jun 2024 22:00:49 +0200 -llvm-toolchain-18 (1:18.1.7-1~exp2) UNRELEASED; urgency=medium - - [ Aurelien Jarno ] - * Enable lldb on riscv64. - - -- Aurelien Jarno Sat, 22 Jun 2024 12:18:16 +0200 - llvm-toolchain-18 (1:18.1.7-1) unstable; urgency=medium * New upstream release From 7bb9784ecbf7004affc05c7f88a05cb7bb1593c1 Mon Sep 17 00:00:00 2001 From: Zixing Liu Date: Wed, 3 Jul 2024 08:06:46 +0200 Subject: [PATCH 242/302] Record GCC-style command-line switches by default This makes Clang default behaviour more like GCC where if debug symbol generation is enabled, the command-line switches data will be stored inside the debug symbols. --- debian/changelog | 8 +++++++ ...clang-record-gcc-switches-by-default.patch | 22 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/clang-record-gcc-switches-by-default.patch diff --git a/debian/changelog b/debian/changelog index a7eb6de0..d2b73270 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-18 (1:18.1.8-2~exp2) UNRELEASED; urgency=medium + + [ Zixing Liu ] + * d/p/clang-record-gcc-switches-by-default.patch: add a patch to force clang + record gcc switches by default + + -- Gianfranco Costamagna Wed, 03 Jul 2024 08:05:35 +0200 + llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/patches/clang-record-gcc-switches-by-default.patch b/debian/patches/clang-record-gcc-switches-by-default.patch new file mode 100644 index 00000000..84715c4d --- /dev/null +++ b/debian/patches/clang-record-gcc-switches-by-default.patch @@ -0,0 +1,22 @@ +Description: Record GCC-style command-line switches by default + This makes Clang default behaviour more like GCC where if debug + symbol generation is enabled, the command-line switches data + will be stored inside the debug symbols. +Author: Zixing Liu +Forwarded: https://github.com/llvm/llvm-project/issues/94690 +Last-Update: 2024-06-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: llvm-toolchain-18-18.1.6/clang/lib/Driver/ToolChains/Clang.cpp +=================================================================== +--- llvm-toolchain-18-18.1.6.orig/clang/lib/Driver/ToolChains/Clang.cpp ++++ llvm-toolchain-18-18.1.6/clang/lib/Driver/ToolChains/Clang.cpp +@@ -7390,7 +7390,7 @@ void Clang::ConstructJob(Compilation &C, + // By default, -gno-record-gcc-switches is set on and no recording. + auto GRecordSwitches = + Args.hasFlag(options::OPT_grecord_command_line, +- options::OPT_gno_record_command_line, false); ++ options::OPT_gno_record_command_line, true); + auto FRecordSwitches = + Args.hasFlag(options::OPT_frecord_command_line, + options::OPT_fno_record_command_line, false); diff --git a/debian/patches/series b/debian/patches/series index 20e24549..8892db2c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -151,3 +151,4 @@ arm32-defaults.diff mips/D154390-pre-R6.diff libsanitizer-timebits.diff ubuntu-releases.patch +clang-record-gcc-switches-by-default.patch From 9b1f6b3775ab1c853558c86fcf765247123e200c Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 3 Jul 2024 08:16:29 +0200 Subject: [PATCH 243/302] Rename some target following upstream changes *Rename check-libcxxabi in check-cxxabi. * Rename check-libcxx in check-cxx * Drop removed check-sanitizer (Closes: #1073201) --- debian/changelog | 5 +++++ debian/rules | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index d2b73270..3f7428b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ llvm-toolchain-18 (1:18.1.8-2~exp2) UNRELEASED; urgency=medium * d/p/clang-record-gcc-switches-by-default.patch: add a patch to force clang record gcc switches by default + [ Gianfranco Costamagna ] + * Rename check-libcxxabi in check-cxxabi. + * Rename check-libcxx in check-cxx + * Drop removed check-sanitizer (Closes: #1073201) + -- Gianfranco Costamagna Wed, 03 Jul 2024 08:05:35 +0200 llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index 07879c0d..1c31e7b3 100755 --- a/debian/rules +++ b/debian/rules @@ -584,7 +584,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-libc;check-sanitizer;llvm-config;test-suite +ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clang-tools;check-lld;check-cxx;check-cxxabi;check-mlir;check-libc;llvm-config;test-suite %: dh $@ $(DH_OPTIONS) @@ -1521,19 +1521,16 @@ ifeq (${LLD_ENABLE},yes) ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-lld || true endif -# Sanitizer - ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-sanitizer || true - -# Libcxx - ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxx || true +# Cxx + ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-cxx || true # Libc ifeq (${LIBC_ENABLE},yes) ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libc || true endif -# Libcxxabi - ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true +# Cxxabi + ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-cxxabi || true # MLIR ifeq (,$(filter $(DEB_HOST_ARCH), armel armhf i386 x32)) From 05d61700e9a889363f1f3bdf84c26d47fe0cf517 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 3 Jul 2024 23:08:50 +0200 Subject: [PATCH 244/302] Bring back libLLVM to be installed in /usr/lib/llvm-18/lib/libLLVM-18.so instead of /usr/lib/llvm-18/lib/libLLVM.so This should make the packages co installable again --- debian/changelog | 3 +++ debian/libllvmX.Y.install.in | 4 ++-- debian/libllvmX.Y.links.in | 8 ++++---- debian/llvm-X.Y-dev.install.in | 1 - debian/llvm-X.Y-dev.links.in | 4 ++-- debian/patches/rename-libllvm.diff | 16 ++++++++++++++++ debian/patches/series | 1 + 7 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 debian/patches/rename-libllvm.diff diff --git a/debian/changelog b/debian/changelog index 3f7428b6..56da18c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium [ Sylvestre Ledru ] * Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR to move the libraries into multi archi directories + * Bring back libLLVM to be installed in /usr/lib/llvm-18/lib/libLLVM-18.so + instead of /usr/lib/llvm-18/lib/libLLVM.so + This should make the packages co installable again (Closes: #1067699, #1067005) (LP: #2063207) * Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index ebdeb0a0..27847582 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.@LLVM_VERSION@.1 diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 6c7bfa20..298e0871 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,5 +1,5 @@ usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so +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@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index d5c7a3c2..d87daf09 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -2,7 +2,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a #usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so usr/lib/llvm-@LLVM_VERSION@/lib/libRemarks.* diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index 90e99374..d57fd6f3 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -1,5 +1,5 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so 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 diff --git a/debian/patches/rename-libllvm.diff b/debian/patches/rename-libllvm.diff new file mode 100644 index 00000000..f1b6cb5e --- /dev/null +++ b/debian/patches/rename-libllvm.diff @@ -0,0 +1,16 @@ +Index: llvm-toolchain-18-18.1.8/llvm/tools/llvm-shlib/CMakeLists.txt +=================================================================== +--- llvm-toolchain-18-18.1.8.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-18-18.1.8/llvm/tools/llvm-shlib/CMakeLists.txt +@@ -36,8 +36,10 @@ if(LLVM_BUILD_LLVM_DYLIB) + if (WIN32) + add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) + else() +- add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB OUTPUT_NAME LLVM ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) ++ message(STATUS "lib name = LLVM-${LLVM_VERSION_MAJOR}") ++ add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB OUTPUT_NAME LLVM-${LLVM_VERSION_MAJOR} ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) + # Add symlink for backwards compatibility with old library name ++ message(STATUS "foo = $(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}") + llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} $ SHARED FULL_DEST COMPONENT LLVM) + endif() + diff --git a/debian/patches/series b/debian/patches/series index 8892db2c..ea23143a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -152,3 +152,4 @@ mips/D154390-pre-R6.diff libsanitizer-timebits.diff ubuntu-releases.patch clang-record-gcc-switches-by-default.patch +rename-libllvm.diff From 82d904325851dc3c7adb4a3984eb85bdda0ba8d7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 4 Jul 2024 11:50:10 +0200 Subject: [PATCH 245/302] libclang: remove the general link + add a check --- debian/changelog | 3 ++- debian/libclang1-X.Y.links.in | 2 -- debian/qualify-clang.sh | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 56da18c8..2adbaa3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,8 @@ llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium to move the libraries into multi archi directories * Bring back libLLVM to be installed in /usr/lib/llvm-18/lib/libLLVM-18.so instead of /usr/lib/llvm-18/lib/libLLVM.so - This should make the packages co installable again + Same for libclang (remove usr/lib/llvm-18/lib/libclang.so.1 + This should make the packages multiarch co installable again (Closes: #1067699, #1067005) (LP: #2063207) * Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in index 3ec0d6ac..db39da7a 100644 --- a/debian/libclang1-X.Y.links.in +++ b/debian/libclang1-X.Y.links.in @@ -1,6 +1,4 @@ # 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 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/qualify-clang.sh b/debian/qualify-clang.sh index 5bffb0b0..156d0132 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -475,6 +475,12 @@ echo '#include int main() { }' > foo.cpp clang++-$VERSION -std=c++11 foo.cpp +if test -f /usr/lib/llvm-$VERSION/lib/libclang.so.1; then + echo "/usr/lib/llvm-$VERSION/lib/libclang.so.1 found." + echo "Break the build as it breaks the coinstalability" + exit 1 +fi + echo "Testing linking clang-cpp ..." clang-$VERSION -lclang-cpp$VERSION -v foo.cpp -o o &> /dev/null || true From 86c8ff3384b42cf285cc40617d4438f038df681c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 4 Jul 2024 11:53:00 +0200 Subject: [PATCH 246/302] fix changelog --- debian/changelog | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2adbaa3f..b9080b0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,3 @@ -llvm-toolchain-18 (1:18.1.8-2~exp2) UNRELEASED; urgency=medium - - [ Zixing Liu ] - * d/p/clang-record-gcc-switches-by-default.patch: add a patch to force clang - record gcc switches by default - - [ Gianfranco Costamagna ] - * Rename check-libcxxabi in check-cxxabi. - * Rename check-libcxx in check-cxx - * Drop removed check-sanitizer (Closes: #1073201) - - -- Gianfranco Costamagna Wed, 03 Jul 2024 08:05:35 +0200 - llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium [ Sylvestre Ledru ] @@ -39,6 +26,15 @@ llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium [ Aurelien Jarno ] * Enable lldb on riscv64. + [ Zixing Liu ] + * d/p/clang-record-gcc-switches-by-default.patch: add a patch to force clang + record gcc switches by default + + [ Gianfranco Costamagna ] + * Rename check-libcxxabi in check-cxxabi. + * Rename check-libcxx in check-cxx + * Drop removed check-sanitizer (Closes: #1073201) + -- Sylvestre Ledru Mon, 01 Jul 2024 22:27:25 +0200 llvm-toolchain-18 (1:18.1.8-1) unstable; urgency=medium From 090d6c348669fa1317225e30abafbc38d5bd819d Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Sat, 22 Jun 2024 00:04:46 +0200 Subject: [PATCH 247/302] 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 c90d3363..8d9b1437 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 a8506043..bdc24b46 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 1c31e7b3..4e84fc2f 100755 --- a/debian/rules +++ b/debian/rules @@ -462,6 +462,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 033208480e107bfccde5f17dc58ec33368a4d903 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 7 Jul 2024 00:39:39 +0200 Subject: [PATCH 248/302] Change the LLVM_HOST_TRIPLE option from i386-linux-gnu to i386-pc-linux-gnu and arm-linux-gnueabihf to arm-pc-linux-gnueabihf Otherwise, it will fail with: Cannot find builtins library for the target architecture --- debian/changelog | 10 ++++++++++ debian/rules | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b9080b0f..8795aca9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +llvm-toolchain-18 (1:18.1.8-2~exp2) experimental; urgency=medium + + * Change the LLVM_HOST_TRIPLE option from i386-linux-gnu to + i386-pc-linux-gnu + and arm-linux-gnueabihf to arm-pc-linux-gnueabihf + Otherwise, it will fail with: + Cannot find builtins library for the target architecture + + -- Sylvestre Ledru Sun, 07 Jul 2024 00:38:27 +0200 + llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/rules b/debian/rules index 4e84fc2f..485b2f42 100755 --- a/debian/rules +++ b/debian/rules @@ -197,7 +197,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armel)) endif ifneq (,$(findstring $(DEB_HOST_ARCH),armhf)) - STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabihf + STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-pc-linux-gnueabihf # align arch profile with debian baseline # https://wiki.debian.org/ArmHardFloatPort#Minimum_CPU_.26_FPU CFLAGS_EXTRA += -march=armv7-a -mfpu=vfpv3-d16 @@ -206,8 +206,8 @@ endif ifneq (,$(filter $(DEB_HOST_ARCH),i386)) # Sometimes, i386 needs help with the triple - STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu - CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu + STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-pc-linux-gnu + CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-pc-linux-gnu endif ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) From 831c7816961b4af5c3e4d6248d1986bd3deccaff Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 7 Jul 2024 16:44:42 +0200 Subject: [PATCH 249/302] * 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 | 11 ++++++ .../patches/link-with-package-metadata.diff | 36 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 48 insertions(+) create mode 100644 debian/patches/link-with-package-metadata.diff diff --git a/debian/changelog b/debian/changelog index 8795aca9..63e75e80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +llvm-toolchain-18 (1:18.1.8-2~exp3) UNRELEASED; urgency=medium + + [ 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. + + -- Matthias Klose Sun, 07 Jul 2024 16:40:35 +0200 + llvm-toolchain-18 (1:18.1.8-2~exp2) experimental; urgency=medium * Change the LLVM_HOST_TRIPLE option from i386-linux-gnu to 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 ea23143a..83715bf3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -153,3 +153,4 @@ libsanitizer-timebits.diff ubuntu-releases.patch clang-record-gcc-switches-by-default.patch rename-libllvm.diff +link-with-package-metadata.diff From 381ba79ebbaeb536db0638cfadf3c0add27d1103 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 7 Jul 2024 16:57:26 +0200 Subject: [PATCH 250/302] * 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 | 11 ++++++ .../patches/link-with-package-metadata.diff | 36 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 48 insertions(+) create mode 100644 debian/patches/link-with-package-metadata.diff diff --git a/debian/changelog b/debian/changelog index c9cdde6b..3e37bbf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +llvm-toolchain-17 (1:17.0.6-13) UNRELEASED; urgency=medium + + [ 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. + + -- Matthias Klose Sun, 07 Jul 2024 16:52:56 +0200 + llvm-toolchain-17 (1:17.0.6-12) unstable; urgency=medium * Add oracular as supported release 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 257a14a1..f01fc78c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -154,3 +154,4 @@ arm32-defaults.diff mips/D154390-pre-R6.diff libsanitizer-timebits.diff D154931-revert-loong64.patch +link-with-package-metadata.diff From 729d02753cb04c999eb85038c173aa5fc090f2e2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 7 Jul 2024 22:03:21 +0200 Subject: [PATCH 251/302] Try to unbreak powerpc & sparc64 --- debian/changelog | 5 ++++- debian/rules | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63e75e80..63941734 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,10 @@ llvm-toolchain-18 (1:18.1.8-2~exp3) UNRELEASED; urgency=medium 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. - -- Matthias Klose Sun, 07 Jul 2024 16:40:35 +0200 + [ Sylvestre Ledru ] + * Try to unbreak powerpc & sparc64 + + -- Sylvestre Ledru Sun, 07 Jul 2024 22:01:17 +0200 llvm-toolchain-18 (1:18.1.8-2~exp2) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index 485b2f42..c69c0730 100755 --- a/debian/rules +++ b/debian/rules @@ -219,7 +219,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) endif ifneq (,$(filter $(DEB_HOST_ARCH),powerpc)) - STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=powerpc-linux-gnu + STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=powerpc-pc-linux-gnu endif # debug symbols OOM in Ubuntu Ubuntu and slows down build process. @@ -230,12 +230,12 @@ else endif ifneq (,$(filter $(DEB_HOST_ARCH),sparc)) - STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=sparc-linux-gnu + STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=sparc-pc-linux-gnu STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif ifneq (,$(filter $(DEB_HOST_ARCH),sparc64)) - STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=sparc64-linux-gnu + STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=sparc64-pc-linux-gnu STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif From 684859a972398b0a5b41d7bc8fa0ef4f0588ca24 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 8 Jul 2024 08:37:06 +0200 Subject: [PATCH 252/302] upload to unstable --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 63941734..17b23de7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-18 (1:18.1.8-2~exp3) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.8-2) unstable; urgency=medium [ Matthias Klose ] * Pass --package-metadata on distros with supporting linkers (starting From 50000c16af073da1799f7caa2db3bb7d5f4d4b7e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 10 Jul 2024 09:40:24 +0200 Subject: [PATCH 253/302] Drop multilib packages on s390* they have been dropped by gcc-defaults. --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 8d9b1437..3e72f42b 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 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, doxygen, ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], diff --git a/debian/control.in b/debian/control.in index bdc24b46..e0597212 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 [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, doxygen, ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], From a18ae302a75fcbab3750ebce587304c92ebd7e94 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 11 Jul 2024 09:24:05 +0200 Subject: [PATCH 254/302] * 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 | 4 ++-- .../patches/link-with-package-metadata.diff | 20 ++++--------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e37bbf1..b03ad600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,10 +4,10 @@ llvm-toolchain-17 (1:17.0.6-13) UNRELEASED; urgency=medium * 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. - -- Matthias Klose Sun, 07 Jul 2024 16:52:56 +0200 + -- Matthias Klose Thu, 11 Jul 2024 09:10:08 +0200 llvm-toolchain-17 (1:17.0.6-12) unstable; urgency=medium 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 7a3ca233a9859d5396795a29a07d1c9fd3636f5f Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 11 Jul 2024 09:28:10 +0200 Subject: [PATCH 255/302] * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. --- debian/changelog | 6 ++++++ .../patches/link-with-package-metadata.diff | 20 ++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 17b23de7..650ca1e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.8-3) UNRELEASED; urgency=medium + + * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. + + -- Matthias Klose Thu, 11 Jul 2024 09:26:34 +0200 + llvm-toolchain-18 (1:18.1.8-2) unstable; urgency=medium [ Matthias Klose ] 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 6de50cd0561bb832e979d975cb71e12189fb6229 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 13 Jul 2024 10:17:56 +0200 Subject: [PATCH 256/302] Revert "Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR to move the libraries into multi archi directories (Closes: #1067699, #1067005) (LP: #2063207)" This reverts commit 9ca35f30383d89e4fdd45d15e0eb82c832df4b8c. --- debian/libc++-X.Y-dev.install.in | 10 +++++----- debian/libc++1-X.Y.install.in | 2 +- debian/libc++abi-X.Y-dev.install.in | 4 ++-- debian/libc++abi1-X.Y.install.in | 2 +- debian/libllvmlibc-X.Y-dev.install.in | 2 +- debian/libunwind-X.Y-dev.install.in | 4 ++-- debian/libunwind-X.Y.install.in | 2 +- debian/qualify-clang.sh | 20 +++++++------------- debian/rules | 24 +++++++----------------- 9 files changed, 27 insertions(+), 43 deletions(-) diff --git a/debian/libc++-X.Y-dev.install.in b/debian/libc++-X.Y-dev.install.in index 8099a083..1a4d26ee 100644 --- a/debian/libc++-X.Y-dev.install.in +++ b/debian/libc++-X.Y-dev.install.in @@ -1,11 +1,11 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.so -usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.a +usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so +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 +usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ +usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a # C++ modules -usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.modules.json +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/libc++1-X.Y.install.in b/debian/libc++1-X.Y.install.in index 606c7fcf..78e2cd3b 100644 --- a/debian/libc++1-X.Y.install.in +++ b/debian/libc++1-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.* diff --git a/debian/libc++abi-X.Y-dev.install.in b/debian/libc++abi-X.Y-dev.install.in index ce71f3e6..8774c6ae 100644 --- a/debian/libc++abi-X.Y-dev.install.in +++ b/debian/libc++abi-X.Y-dev.install.in @@ -1,3 +1,3 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi*so -usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi.a +usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi*so +usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a libcxxabi/include/* usr/lib/llvm-@LLVM_VERSION@/include/ diff --git a/debian/libc++abi1-X.Y.install.in b/debian/libc++abi1-X.Y.install.in index a7e1c070..6e27733d 100644 --- a/debian/libc++abi1-X.Y.install.in +++ b/debian/libc++abi1-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.* diff --git a/debian/libllvmlibc-X.Y-dev.install.in b/debian/libllvmlibc-X.Y-dev.install.in index e8fe2fc3..cd6c1add 100644 --- a/debian/libllvmlibc-X.Y-dev.install.in +++ b/debian/libllvmlibc-X.Y-dev.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/*/libllvmlibc.a +usr/lib/llvm-@LLVM_VERSION@/lib/libllvmlibc.a diff --git a/debian/libunwind-X.Y-dev.install.in b/debian/libunwind-X.Y-dev.install.in index f01f1bb5..f22f67f2 100644 --- a/debian/libunwind-X.Y-dev.install.in +++ b/debian/libunwind-X.Y-dev.install.in @@ -1,5 +1,5 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.so -usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.a +usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so +usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.a usr/include/libunwind usr/lib/llvm-@LLVM_VERSION@/include/*unwind* usr/lib/llvm-@LLVM_VERSION@/include/mach-o/ diff --git a/debian/libunwind-X.Y.install.in b/debian/libunwind-X.Y.install.in index 9857c78a..e26306e4 100644 --- a/debian/libunwind-X.Y.install.in +++ b/debian/libunwind-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.* diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 156d0132..3f742131 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -485,8 +485,8 @@ echo "Testing linking clang-cpp ..." clang-$VERSION -lclang-cpp$VERSION -v foo.cpp -o o &> /dev/null || true if ! ldd o 2>&1|grep -q libclang-cpp; then - echo "Didn't link against libclang-cpp$VERSION" - exit 42 + echo "Didn't link against libclang-cpp$VERSION" + exit 42 fi ./o > /dev/null @@ -955,7 +955,7 @@ if test ! -f /usr/lib/llvm-$VERSION/include/c++/v1/vector; then exit -1; fi -if test ! -f /usr/lib/llvm-$VERSION/lib/$ARCH/libc++abi.so; then +if test ! -f /usr/lib/llvm-$VERSION/lib/libc++abi.so; then echo "Install libc++abi-$VERSION-dev"; exit -1; fi @@ -1042,8 +1042,7 @@ EOF # Builds the std module clang++-$VERSION -std=c++20 \ -nostdinc++ \ - -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ - -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ --precompile -o std.pcm \ -c /usr/lib/llvm-$VERSION/share/libc++/v1/std.cppm @@ -1051,8 +1050,7 @@ clang++-$VERSION -std=c++20 \ # Builds the std.compat module clang++-$VERSION -std=c++20 \ -nostdinc++ \ - -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ - -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ + -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ --precompile -o std.compat.pcm \ -fmodule-file=std=std.pcm \ @@ -1161,8 +1159,7 @@ int main(void) clang-$VERSION -Wconversion -Werror foo.c &> /dev/null || true if test -f /usr/bin/g++; then -g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -I/usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ - -L/usr/lib/llvm-$VERSION/lib/ \ +g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -L/usr/lib/llvm-$VERSION/lib/ \ foo.cpp -nodefaultlibs -std=c++17 -lc++ -lc++abi -lm -lc -lgcc_s -lgcc|| true ./o > /dev/null fi @@ -1182,7 +1179,6 @@ EOF clang-$VERSION -std=c++20 \ -nostdinc++ \ -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ - -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ --precompile -o std.pcm \ -c /usr/lib/llvm-$VERSION/share/libc++/v1/std.cppm @@ -1191,7 +1187,6 @@ clang-$VERSION -std=c++20 \ clang-$VERSION -std=c++20 \ -nostdinc++ \ -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ - -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ -Wno-reserved-module-identifier -Wno-reserved-user-defined-literal \ --precompile -o std.compat.pcm \ -fmodule-file=std=std.pcm \ @@ -1201,7 +1196,6 @@ clang-$VERSION -std=c++20 \ clang-$VERSION -std=c++20 \ -nostdinc++ \ -isystem /usr/lib/llvm-$VERSION/include/c++/v1/ \ - -isystem /usr/lib/llvm-$VERSION/include/$ARCH/c++/v1/ \ -L /usr/lib/llvm-$VERSION/lib \ -fmodule-file=std=std.pcm \ -fmodule-file=std.compat=std.compat.pcm \ @@ -1425,7 +1419,7 @@ int main(int, char**) { return -2; } '> foo.cpp -clang++-$VERSION foo.cpp /usr/lib/llvm-$VERSION/lib/$ARCH/libunwind.a -I/usr/include/libunwind/ -lpthread -ldl +clang++-$VERSION foo.cpp /usr/lib/llvm-$VERSION/lib/libunwind.a -I/usr/include/libunwind/ -lpthread -ldl ./a.out||true clang++-$VERSION foo.cpp -unwindlib=libunwind -rtlib=compiler-rt -I/usr/include/libunwind -ldl ./a.out||true diff --git a/debian/rules b/debian/rules index c69c0730..6d7d3cf1 100755 --- a/debian/rules +++ b/debian/rules @@ -829,8 +829,8 @@ endif -DLIBOMP_OMPT_SUPPORT=OFF \ -DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=ON \ $(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=ON" \ - -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=ON" \ + -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" \ -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" \ @@ -860,8 +860,8 @@ endif -DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \ -DBOOTSTRAP_PYTHON_EXECUTABLE=/usr/bin/python3 \ $(BOOTSTRAP_CMAKE_EXTRA) \ - -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" \ - -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON" + -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ + -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(RUNTIMES_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" FOUND_VERSION=`grep LLVM_VERSION_STRING build-llvm/include/llvm/Config/llvm-config.h|cut -d\" -f2`; \ if ! echo "$(LLVM_VERSION_FULL)"|grep "$$FOUND_VERSION"; then \ @@ -1180,7 +1180,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/*/*.so + chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so endif endif @@ -1388,9 +1388,7 @@ override_dh_makeshlibs: override_dh_shlibdeps: # Ignore asan libraries. They would trigger dependencies to multiarch libraries - TRIPLE_CLANG_ARCH=`debian/tmp/usr/bin/clang-$(LLVM_VERSION) -dumpmachine`; \ - echo "TRIPLE_CLANG_ARCH = $$TRIPLE_CLANG_ARCH"; \ - dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/$$TRIPLE_CLANG_ARCH/ -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so + dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so override_dh_installman: if test -f lld/docs/ld.lld.1; then \ @@ -1441,9 +1439,7 @@ override_dh_install: ifeq (${POLLY_ENABLE},yes) # only for arch:any builds ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(packages))) - if test -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/PollyConfig.cmake; then \ - dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly; \ - fi + dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly # On old Debian & Ubuntu, removing the files is necessary rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake else @@ -1454,12 +1450,6 @@ endif # 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))) -# Keep only one copy of the wasm files - rm -rf \ - $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/ \ - $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/wasm32-wasi/ \ - $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/wasm32-wasi/ - mkdir -p $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1 if test -f $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h; then \ mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h \ From 459e8ebab8c6cb444a77c55d7943288277e45f69 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 13 Jul 2024 10:27:43 +0200 Subject: [PATCH 257/302] update of the changelog --- debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 650ca1e7..6bf83984 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ llvm-toolchain-18 (1:18.1.8-3) UNRELEASED; urgency=medium + [ Matthias Klose ] * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. - -- Matthias Klose Thu, 11 Jul 2024 09:26:34 +0200 + [ Sylvestre Ledru ] + * Revert LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON + 9ca35f30383d89e4fdd45d15e0eb82c832df4b8c + For causing https://github.com/llvm/llvm-project/issues/96210 + + -- Sylvestre Ledru Sat, 13 Jul 2024 10:26:40 +0200 llvm-toolchain-18 (1:18.1.8-2) unstable; urgency=medium From 3f5db5d6aa2f626c97a4e42487bee41eb37ad606 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 14 Jul 2024 17:40:17 +0200 Subject: [PATCH 258/302] Revert " * Construct the --package-metadata option just from ELF_PACKAGE_METADATA." This reverts commit 7a3ca233a9859d5396795a29a07d1c9fd3636f5f. --- debian/changelog | 4 ---- .../patches/link-with-package-metadata.diff | 20 +++++++++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6bf83984..e9ed82c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,5 @@ llvm-toolchain-18 (1:18.1.8-3) UNRELEASED; urgency=medium - [ Matthias Klose ] - * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. - - [ Sylvestre Ledru ] * Revert LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON 9ca35f30383d89e4fdd45d15e0eb82c832df4b8c For causing https://github.com/llvm/llvm-project/issues/96210 diff --git a/debian/patches/link-with-package-metadata.diff b/debian/patches/link-with-package-metadata.diff index b82b5ff4..a9a8fc01 100644 --- a/debian/patches/link-with-package-metadata.diff +++ b/debian/patches/link-with-package-metadata.diff @@ -1,21 +1,33 @@ --- 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 +@@ -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 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 c2a0a640826b60b676875305f4464386acafa084 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 14 Jul 2024 22:12:00 +0200 Subject: [PATCH 259/302] Disable LLDB_BUILD_INTEL_PT on Ubuntu bionic --- debian/changelog | 1 + debian/rules | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index e9ed82c8..ecbdd4ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-18 (1:18.1.8-3) UNRELEASED; urgency=medium * Revert LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON 9ca35f30383d89e4fdd45d15e0eb82c832df4b8c For causing https://github.com/llvm/llvm-project/issues/96210 + * Disable LLDB_BUILD_INTEL_PT on Ubuntu bionic -- Sylvestre Ledru Sat, 13 Jul 2024 10:26:40 +0200 diff --git a/debian/rules b/debian/rules index 6d7d3cf1..cfb89f82 100755 --- a/debian/rules +++ b/debian/rules @@ -462,9 +462,13 @@ else STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_LUA=OFF PROJECTS+=;lldb endif + +LLDB_PT_DISABLE_DISTRO := bionic ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) +ifneq (,$(filter $(LLDB_PT_DISABLE_DISTRO),$(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 LLDB_PYTHON_ENABLE=yes From b3fc2e226916f29dd75501e389cda8a53356d1e8 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 15 Jul 2024 09:57:58 +0200 Subject: [PATCH 260/302] * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. --- debian/changelog | 4 ++++ .../patches/link-with-package-metadata.diff | 20 ++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index ecbdd4ac..cf39edbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ llvm-toolchain-18 (1:18.1.8-3) UNRELEASED; urgency=medium + [ Matthias Klose ] + * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. + + [ Sylvestre Ledru ] * Revert LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON 9ca35f30383d89e4fdd45d15e0eb82c832df4b8c For causing https://github.com/llvm/llvm-project/issues/96210 diff --git a/debian/patches/link-with-package-metadata.diff b/debian/patches/link-with-package-metadata.diff index a9a8fc01..1f413758 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 +@@ -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 b2c59c2e6e7011d9891ccb14962d1ade0fc602d5 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 15 Jul 2024 10:02:30 +0200 Subject: [PATCH 261/302] fix typo --- debian/patches/link-with-package-metadata.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/link-with-package-metadata.diff b/debian/patches/link-with-package-metadata.diff index b82b5ff4..594e44f2 100644 --- a/debian/patches/link-with-package-metadata.diff +++ b/debian/patches/link-with-package-metadata.diff @@ -7,7 +7,7 @@ + if (Distro.IsDebian() && Distro >= Distro::DebianTrixie + || Distro.IsUbuntu() && Distro >= Distro::UbuntuNoble) + { -+ const char pkg_metadata = getenv ("ELF_PACKAGE_METADATA"); ++ const char *pkg_metadata = getenv ("ELF_PACKAGE_METADATA"); + const char *no_pkg_metadata = getenv ("NO_PKG_METADATA"); + + if (no_pkg_metadata) { From ac3b67c192dc86eb3a53918211b6d7731c189b78 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 15 Jul 2024 12:30:45 +0200 Subject: [PATCH 262/302] Make libllvm co-installable again (Closes: #1076131) --- debian/changelog | 9 +++++++-- debian/libllvmX.Y.install.in | 4 ++-- debian/libllvmX.Y.links.in | 9 ++++----- debian/llvm-X.Y-dev.links.in | 7 +++++-- debian/rules | 5 +++++ 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index cf39edbe..76375329 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,20 @@ -llvm-toolchain-18 (1:18.1.8-3) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.8-4) UNRELEASED; urgency=medium [ Matthias Klose ] * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. + -- Sylvestre Ledru Mon, 15 Jul 2024 12:30:36 +0200 + +llvm-toolchain-18 (1:18.1.8-3) unstable; urgency=medium + [ Sylvestre Ledru ] * Revert LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON 9ca35f30383d89e4fdd45d15e0eb82c832df4b8c For causing https://github.com/llvm/llvm-project/issues/96210 * Disable LLDB_BUILD_INTEL_PT on Ubuntu bionic + * Make libllvm co-installable again (Closes: #1076131) - -- Sylvestre Ledru Sat, 13 Jul 2024 10:26:40 +0200 + -- Sylvestre Ledru Mon, 15 Jul 2024 09:49:47 +0200 llvm-toolchain-18 (1:18.1.8-2) unstable; urgency=medium diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index 27847582..80d9fdbf 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.@LLVM_VERSION@.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.@LLVM_VERSION@.1 diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 298e0871..067b0884 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,5 +1,4 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so -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@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 +# 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 + diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index d57fd6f3..b3a2a2ae 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -1,5 +1,8 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so -usr/lib/llvm-@LLVM_VERSION@/lib/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/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 diff --git a/debian/rules b/debian/rules index cfb89f82..8ca03582 100755 --- a/debian/rules +++ b/debian/rules @@ -1167,6 +1167,11 @@ override_dh_auto_install: # install/fast enables a make install without recompiling temporary files LD_LIBRARY_PATH=$(STAGE_2_LIB_DIR):$$LD_LIBRARY_PATH DESTDIR=$(DEB_INST)/ ninja -C $(TARGET_BUILD) $(VERBOSE) stage2-install + # Move libLLVM to /usr/lib/TRIPLE/libLLVM-XX.so.1 to make it multiarch ready + mkdir -p $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ + mv $(DEB_INST)/usr/lib/llvm-18/lib/libLLVM-$(LLVM_VERSION).so.1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ + mv $(DEB_INST)/usr/lib/llvm-18/lib/libLLVM-$(LLVM_VERSION).so.$(LLVM_VERSION).1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/ + # Not used on Linux. rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang/clang-format-bbedit.applescript From c003ec809de8d3f168911273fa604c8e427c7745 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 16 Jul 2024 18:02:47 +0200 Subject: [PATCH 263/302] fix the symlinks after LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF Probably caused https://github.com/llvm/llvm-project/issues/99017 --- debian/changelog | 6 +++++- debian/libc++1-X.Y.links.in | 4 +++- debian/libc++abi1-X.Y.links.in | 2 ++ debian/libunwind-X.Y-dev.links.in | 7 +++++-- debian/libunwind-X.Y.links.in | 4 +++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 76375329..75f6e4b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ llvm-toolchain-18 (1:18.1.8-4) UNRELEASED; urgency=medium + * fix the symlinks after LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF + Probably caused + https://github.com/llvm/llvm-project/issues/99017 + [ Matthias Klose ] * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. - -- Sylvestre Ledru Mon, 15 Jul 2024 12:30:36 +0200 + -- Sylvestre Ledru Tue, 16 Jul 2024 18:02:17 +0200 llvm-toolchain-18 (1:18.1.8-3) unstable; urgency=medium diff --git a/debian/libc++1-X.Y.links.in b/debian/libc++1-X.Y.links.in index 1e34d1d4..a12b1707 100644 --- a/debian/libc++1-X.Y.links.in +++ b/debian/libc++1-X.Y.links.in @@ -1,2 +1,4 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 +usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 +# when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON: +#usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1 diff --git a/debian/libc++abi1-X.Y.links.in b/debian/libc++abi1-X.Y.links.in index 8d706053..b054e34b 100644 --- a/debian/libc++abi1-X.Y.links.in +++ b/debian/libc++abi1-X.Y.links.in @@ -1,2 +1,4 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 +# when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON: usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1 diff --git a/debian/libunwind-X.Y-dev.links.in b/debian/libunwind-X.Y-dev.links.in index e00c7d14..ea1b58ac 100644 --- a/debian/libunwind-X.Y-dev.links.in +++ b/debian/libunwind-X.Y-dev.links.in @@ -1,2 +1,5 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so -usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.a /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.a +usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so +usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.a /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.a +# when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON: +#usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so +#usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.a /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.a diff --git a/debian/libunwind-X.Y.links.in b/debian/libunwind-X.Y.links.in index 530f3966..db1c89c3 100644 --- a/debian/libunwind-X.Y.links.in +++ b/debian/libunwind-X.Y.links.in @@ -1,2 +1,4 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0 +usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0 +# when LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON: +#usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH_LLVM@/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0 usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1 From 24a43f979796993ba89bc04c1b5bbcd231b4a180 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 16 Jul 2024 22:57:23 +0200 Subject: [PATCH 264/302] remove hardcoded version --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 8ca03582..7745585b 100755 --- a/debian/rules +++ b/debian/rules @@ -1169,8 +1169,8 @@ override_dh_auto_install: # Move libLLVM to /usr/lib/TRIPLE/libLLVM-XX.so.1 to make it multiarch ready mkdir -p $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ - mv $(DEB_INST)/usr/lib/llvm-18/lib/libLLVM-$(LLVM_VERSION).so.1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ - mv $(DEB_INST)/usr/lib/llvm-18/lib/libLLVM-$(LLVM_VERSION).so.$(LLVM_VERSION).1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/ + mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ + mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(LLVM_VERSION).1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/ # Not used on Linux. rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper From 3cfb90d49c6ee03e002eb86d149df0f1eee87bb6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 17 Jul 2024 14:01:05 +0200 Subject: [PATCH 265/302] Move back /usr/lib/llvm-18/lib/libLLVM-18.so.1 to libllvm18 (Closes: #1076469) And add breaks/replaces to make sure the upgrade goes smoothly --- debian/changelog | 4 +++- debian/control.in | 2 ++ debian/libllvmX.Y.links.in | 7 ++++++- debian/llvm-X.Y-dev.links.in | 3 --- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 75f6e4b6..7111aa39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -llvm-toolchain-18 (1:18.1.8-4) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.8-4) unstable; urgency=medium * fix the symlinks after LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF Probably caused https://github.com/llvm/llvm-project/issues/99017 + * Move back /usr/lib/llvm-18/lib/libLLVM-18.so.1 to libllvm18 (Closes: #1076469) + And add breaks/replaces to make sure the upgrade goes smoothly [ Matthias Klose ] * Construct the --package-metadata option just from ELF_PACKAGE_METADATA. diff --git a/debian/control.in b/debian/control.in index e0597212..73ba6ea2 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:18.1.8-4) +Replaces: llvm-@LLVM_VERSION@-dev (<< 1:18.1.8-4) 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/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 067b0884..b6cbdb92 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,4 +1,9 @@ # 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 +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/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 + +# Should be in llvm-X.Y-dev but as it has been this way for a long time... +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index b3a2a2ae..16e529c7 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -1,8 +1,5 @@ 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 From 99f1459bc691b8efdbf724563af4d2d4210a10d0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 30 May 2024 12:02:08 +0200 Subject: [PATCH 266/302] use the DEB_INST variable --- debian/rules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index 7745585b..e21af362 100755 --- a/debian/rules +++ b/debian/rules @@ -1194,13 +1194,13 @@ endif endif if test "$(LIBUNWIND_ENABLE)" = yes; then \ - mkdir -p debian/tmp/usr/include/libunwind; \ - cp -R libunwind/include/* debian/tmp/usr/include/libunwind/; \ + mkdir -p $(DEB_INST)/usr/include/libunwind; \ + cp -R libunwind/include/* $(DEB_INST)/usr/include/libunwind/; \ fi : # libomp if test "$(OPENMP_ENABLE)" = yes; then \ - cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib; \ + cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib; \ ln -s libomp.so.$(SONAME_OPENMP) libomp.so; \ cp libomp.so.$(SONAME_OPENMP) libomp-$(LLVM_VERSION).so.$(SONAME_OPENMP); \ fi @@ -1249,7 +1249,7 @@ endif $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/*/__pycache__/ # workaround issue https://github.com/llvm/llvm-project/issues/57101 - find debian/tmp -iname 'libbolt_rt*.a' -path '*/build-llvm/*' -delete + find $(DEB_INST) -iname 'libbolt_rt*.a' -path '*/build-llvm/*' -delete # Remove an osx file rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libbolt_rt_instr_osx.a @@ -1450,9 +1450,9 @@ ifeq (${POLLY_ENABLE},yes) ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(packages))) dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly # On old Debian & Ubuntu, removing the files is necessary - rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake + rm -rf $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake else - rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake + rm -rf $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake endif endif dh_install --fail-missing ${skip_packages} @@ -1484,7 +1484,7 @@ override_dh_installdeb: stamps/repack_a_llvm_ir # Managed by the package dh_installdeb -a - rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc $(CURDIR)/debian/python*-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc $(CURDIR)/debian/python*-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make* # the openmp header files moved to the same path as lib clang headers. From 6426259584d82bf69e372ef3e4055c87be45132b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Jul 2024 22:02:47 +0200 Subject: [PATCH 267/302] Fix the broken Breaks/replaces for apt.llvm.org Closes: https://github.com/llvm/llvm-project/issues/99502 --- debian/changelog | 7 +++++++ debian/rules | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7111aa39..d044e379 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.8-5) unstable; urgency=medium + + * Fix the broken Breaks/replaces for apt.llvm.org + Closes: https://github.com/llvm/llvm-project/issues/99502 + + -- Sylvestre Ledru Thu, 18 Jul 2024 22:02:44 +0200 + llvm-toolchain-18 (1:18.1.8-4) unstable; urgency=medium * fix the symlinks after LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF diff --git a/debian/rules b/debian/rules index e21af362..4f74ff8c 100755 --- a/debian/rules +++ b/debian/rules @@ -681,8 +681,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)" = "18"; then \ + sed -i -e "s| (<< 1:18.1.8-4)|(<< 1:18.1.8~++20240717045021)|g" debian/control; \ fi # llvm-spirv was found, so we can enable *.spv files. Debian From 6028dcabb5c00e4c8f9e85e1b6f98f1cb5284fec Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Jul 2024 22:12:54 +0200 Subject: [PATCH 268/302] fix the version upgrade --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 4f74ff8c..245aed4d 100755 --- a/debian/rules +++ b/debian/rules @@ -678,11 +678,13 @@ stamps/preconfigure: debian/llvm-$(LLVM_VERSION)-linker-tools.links \ debian/libbolt-$(LLVM_VERSION)-dev.install - # workaround the breaks/replaces/conflicts introduced with the libc++ move + # workaround the breaks/replaces/conflicts introduced with the libllvm 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)" = "18"; then \ + if echo $(LLVM_VERSION_SNAPSHOT)| grep -q "~++"; then \ sed -i -e "s| (<< 1:18.1.8-4)|(<< 1:18.1.8~++20240717045021)|g" debian/control; \ + fi; \ fi # llvm-spirv was found, so we can enable *.spv files. Debian From d8974079d1f976d57c596ad90e158fc7432f2687 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 18 Jul 2024 22:13:26 +0200 Subject: [PATCH 269/302] refresh the control --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 3e72f42b..e5af866e 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: llvm-18-dev (<< 1:18.1.8-4) +Replaces: llvm-18-dev (<< 1:18.1.8-4) 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 fc6b1ea35ef2d082a9aa8819bc9c90c451b260ac Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 19 Jul 2024 23:05:37 +0200 Subject: [PATCH 270/302] Bring back libLLVM.so.18.1 as symlink library --- debian/changelog | 1 + debian/libllvmX.Y.links.in | 1 + debian/qualify-clang.sh | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index d044e379..97b4a280 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-18 (1:18.1.8-5) unstable; urgency=medium * Fix the broken Breaks/replaces for apt.llvm.org Closes: https://github.com/llvm/llvm-project/issues/99502 + * Bring back libLLVM.so.18.1 as symlink library -- Sylvestre Ledru Thu, 18 Jul 2024 22:02:44 +0200 diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index b6cbdb92..19f8dc2e 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -4,6 +4,7 @@ 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/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 # Should be in llvm-X.Y-dev but as it has been this way for a long time... usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 3f742131..8758e8d5 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -36,6 +36,12 @@ if test -f /usr/lib/llvm-$VERSION/lib/libLLVM.so; then exit 1 fi +NBLINES=$(dpkg -L libllvm$VERSION|grep libLLVM.so.$VERSION.1|wc -l) +if test $NBLINES -eq 0; then + echo "libLLVM.so.$VERSION.1 should exist. Could not find it in libllvm$VERSION" + exit 1 +fi + echo "Testing llvm-$VERSION and llvm-$VERSION-dev ..." llvm-config-$VERSION --link-shared --libs &> /dev/null From 7011745039924c388d9df67f2d8273b299dec3dc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 19 Jul 2024 23:06:24 +0200 Subject: [PATCH 271/302] add bug --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 97b4a280..6742595b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-18 (1:18.1.8-5) unstable; urgency=medium * Fix the broken Breaks/replaces for apt.llvm.org Closes: https://github.com/llvm/llvm-project/issues/99502 * Bring back libLLVM.so.18.1 as symlink library + (LP: #2073604) -- Sylvestre Ledru Thu, 18 Jul 2024 22:02:44 +0200 From 5189135c7721ba378fefc6e0225dc764d6afe8a2 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sun, 21 Jul 2024 23:28:06 +0200 Subject: [PATCH 272/302] Make regexp to grep for LLVM_DEFAULT_TARGET_TRIPLE less ambigious --- debian/changelog | 7 +++++++ debian/rules | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6742595b..2869bdd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.8-6) UNRELEASED; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Make regexp to grep for LLVM_DEFAULT_TARGET_TRIPLE less ambigious + + -- John Paul Adrian Glaubitz Sun, 21 Jul 2024 23:25:02 +0200 + llvm-toolchain-18 (1:18.1.8-5) unstable; urgency=medium * Fix the broken Breaks/replaces for apt.llvm.org diff --git a/debian/rules b/debian/rules index 245aed4d..e2faa1ab 100755 --- a/debian/rules +++ b/debian/rules @@ -876,7 +876,7 @@ endif fi @mkdir -p stamps # Detect the triple - TRIPLE=`grep LLVM_DEFAULT_TARGET_TRIPLE build-llvm/CMakeCache.txt|cut -d= -f2`; \ + TRIPLE=`grep ^LLVM_DEFAULT_TARGET_TRIPLE build-llvm/CMakeCache.txt|cut -d= -f2`; \ sed -i -e "s|@DEB_HOST_MULTIARCH_LLVM@|$$TRIPLE|g" debian/*.links touch $@ From 3c0d3f58fdeb072224b505cee05b8e82b364c1bc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jul 2024 11:54:47 +0200 Subject: [PATCH 273/302] merge changelog --- debian/changelog | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2869bdd6..b93744dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -llvm-toolchain-18 (1:18.1.8-6) UNRELEASED; urgency=medium - - [ John Paul Adrian Glaubitz ] - * Make regexp to grep for LLVM_DEFAULT_TARGET_TRIPLE less ambigious - - -- John Paul Adrian Glaubitz Sun, 21 Jul 2024 23:25:02 +0200 - llvm-toolchain-18 (1:18.1.8-5) unstable; urgency=medium * Fix the broken Breaks/replaces for apt.llvm.org @@ -12,7 +5,10 @@ llvm-toolchain-18 (1:18.1.8-5) unstable; urgency=medium * Bring back libLLVM.so.18.1 as symlink library (LP: #2073604) - -- Sylvestre Ledru Thu, 18 Jul 2024 22:02:44 +0200 + [ John Paul Adrian Glaubitz ] + * Make regexp to grep for LLVM_DEFAULT_TARGET_TRIPLE less ambigious + + -- Sylvestre Ledru Wed, 24 Jul 2024 11:54:39 +0200 llvm-toolchain-18 (1:18.1.8-4) unstable; urgency=medium From 2efcb337a3fd69cfb4cc10863022929514e685bf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Jul 2024 19:41:03 +0200 Subject: [PATCH 274/302] temporary disable spirv to unbreak the build --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index b93744dd..e4e13a65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-18 (1:18.1.8-5) unstable; urgency=medium Closes: https://github.com/llvm/llvm-project/issues/99502 * Bring back libLLVM.so.18.1 as symlink library (LP: #2073604) + * temporary disable spirv to unbreak the build [ John Paul Adrian Glaubitz ] * Make regexp to grep for LLVM_DEFAULT_TARGET_TRIPLE less ambigious diff --git a/debian/rules b/debian/rules index e2faa1ab..b4f0bb2a 100755 --- a/debian/rules +++ b/debian/rules @@ -301,6 +301,8 @@ else endif endif +LLVM_SPIRV_INSTALLED = no + LIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl LIBCLC_LLVM_SPIRV = ifeq ($(LLVM_SPIRV_INSTALLED),yes) From ad4b8cb8bac2a323bd076af5c7fed87879d3bf4d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Jul 2024 17:35:31 +0200 Subject: [PATCH 275/302] Make libllvm multi arch ready again ... (Closes: #1076131) --- debian/changelog | 6 ++++++ debian/libllvmX.Y.links.in | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4e13a65..9a330e54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.8-6) unstable; urgency=medium + + * Make libllvm multi arch ready again ... (Closes: #1076131) + + -- Sylvestre Ledru Fri, 26 Jul 2024 17:34:31 +0200 + llvm-toolchain-18 (1:18.1.8-5) unstable; urgency=medium * Fix the broken Breaks/replaces for apt.llvm.org diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 19f8dc2e..2d2060a8 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,8 +1,7 @@ # 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/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/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 From b98d211b69f38833160b1302e805c1cf9bafbf52 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Jul 2024 17:35:37 +0200 Subject: [PATCH 276/302] bring back spirv --- debian/changelog | 1 + debian/rules | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9a330e54..a098b20b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-18 (1:18.1.8-6) unstable; urgency=medium * Make libllvm multi arch ready again ... (Closes: #1076131) + * bring back spirv -- Sylvestre Ledru Fri, 26 Jul 2024 17:34:31 +0200 diff --git a/debian/rules b/debian/rules index b4f0bb2a..e2faa1ab 100755 --- a/debian/rules +++ b/debian/rules @@ -301,8 +301,6 @@ else endif endif -LLVM_SPIRV_INSTALLED = no - LIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl LIBCLC_LLVM_SPIRV = ifeq ($(LLVM_SPIRV_INSTALLED),yes) From c927410913ad1e69993f623587b54158f1b23112 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Jul 2024 17:49:46 +0200 Subject: [PATCH 277/302] add a check to make sure it doesn't happen again --- debian/qualify-clang.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 8758e8d5..b1232c78 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -30,8 +30,11 @@ if test ! -f /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so; then exit 1 fi -if test -f /usr/lib/llvm-$VERSION/lib/libLLVM.so; then - echo "/usr/lib/llvm-$VERSION/lib/libLLVM.so found." +NBLINES=$(ls -1 /usr/lib/llvm-$VERSION/lib/libLLVM*.so*|wc -l) +if test $NBLINES -ne 0; then + echo "Found some libLLVM into /usr/lib/llvm-$VERSION/lib/" + echo "See:" + ls -al /usr/lib/llvm-$VERSION/lib/libLLVM*.so* echo "Break the build as it breaks the coinstalability" exit 1 fi From 567c09aeccd539de6e6e58b16a9fc774a350131c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Jul 2024 17:57:43 +0200 Subject: [PATCH 278/302] fix more multiarch issues --- debian/libllvmX.Y.links.in | 1 - debian/llvm-X.Y-dev.links.in | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 2d2060a8..8a0572be 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,7 +1,6 @@ # 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_FULL@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.1 diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index 16e529c7..a182df53 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -1,5 +1,4 @@ -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_FULL@.so +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so 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 From efc4f005cc4f0df76e5e7031a194059af8977c50 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Jul 2024 09:10:58 +0200 Subject: [PATCH 279/302] fix multiarch again --- debian/llvm-X.Y-dev.install.in | 1 - debian/qualify-clang.sh | 4 +++- debian/rules | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index d87daf09..c323b1db 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -2,7 +2,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a #usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a -usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so usr/lib/llvm-@LLVM_VERSION@/lib/libRemarks.* usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/ diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index b1232c78..e87c0803 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -25,7 +25,9 @@ if test ! -f /usr/bin/llvm-config-$VERSION; then echo "Install llvm-$VERSION & llvm-$VERSION-dev" exit 1 fi -if test ! -f /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so; then +ls -al /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so + +if test ! -e /usr/lib/llvm-$VERSION/lib/libLLVMObject.a; then echo "Install llvm-$VERSION-dev" exit 1 fi diff --git a/debian/rules b/debian/rules index e2faa1ab..e9ac803c 100755 --- a/debian/rules +++ b/debian/rules @@ -1173,6 +1173,8 @@ override_dh_auto_install: mkdir -p $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(LLVM_VERSION).1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/ + # we have enough like + multiarch + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION)*.so # Not used on Linux. rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper From 34b6df397f139ff641964f9f2939e6cfa80fe810 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Jul 2024 18:42:34 +0200 Subject: [PATCH 280/302] bring back the lib --- debian/llvm-X.Y-dev.install.in | 1 + debian/qualify-clang.sh | 2 -- debian/rules | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index c323b1db..d87daf09 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -2,6 +2,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a #usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so usr/lib/llvm-@LLVM_VERSION@/lib/libRemarks.* usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/ diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index e87c0803..02363edb 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -25,8 +25,6 @@ if test ! -f /usr/bin/llvm-config-$VERSION; then echo "Install llvm-$VERSION & llvm-$VERSION-dev" exit 1 fi -ls -al /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so - if test ! -e /usr/lib/llvm-$VERSION/lib/libLLVMObject.a; then echo "Install llvm-$VERSION-dev" exit 1 diff --git a/debian/rules b/debian/rules index e9ac803c..e2faa1ab 100755 --- a/debian/rules +++ b/debian/rules @@ -1173,8 +1173,6 @@ override_dh_auto_install: mkdir -p $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(LLVM_VERSION).1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/ - # we have enough like + multiarch - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION)*.so # Not used on Linux. rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper From 09a477d4a622e6af06bf8ae37cf3d03073e3efa8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Jul 2024 18:45:28 +0200 Subject: [PATCH 281/302] fix the check --- debian/qualify-clang.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 02363edb..8adcdecb 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -30,7 +30,9 @@ if test ! -e /usr/lib/llvm-$VERSION/lib/libLLVMObject.a; then exit 1 fi -NBLINES=$(ls -1 /usr/lib/llvm-$VERSION/lib/libLLVM*.so*|wc -l) +# allow usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so +# as it is in llvm-X.Y-dev +NBLINES=$(ls -1 /usr/lib/llvm-$VERSION/lib/libLLVM*.so*|grep -v llvm-$VERSION/lib/libLLVM-$VERSION*.so|wc -l) if test $NBLINES -ne 0; then echo "Found some libLLVM into /usr/lib/llvm-$VERSION/lib/" echo "See:" From af57381ddee2ad6a40c191fac7562efeb63d18ee Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Jul 2024 18:47:11 +0200 Subject: [PATCH 282/302] improve the check --- debian/qualify-clang.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 8adcdecb..cb7a2368 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -32,12 +32,13 @@ fi # allow usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so # as it is in llvm-X.Y-dev -NBLINES=$(ls -1 /usr/lib/llvm-$VERSION/lib/libLLVM*.so*|grep -v llvm-$VERSION/lib/libLLVM-$VERSION*.so|wc -l) -if test $NBLINES -ne 0; then +NBLINES=$(ls -1 /usr/lib/llvm-$VERSION/lib/libLLVM*.so*|wc -l) +if test $NBLINES -ne 1; then echo "Found some libLLVM into /usr/lib/llvm-$VERSION/lib/" echo "See:" ls -al /usr/lib/llvm-$VERSION/lib/libLLVM*.so* echo "Break the build as it breaks the coinstalability" + echo "we should have only one for llvm-X.Y-dev" exit 1 fi From e0a41433c534a98f11a24a5084d1cca2f6eef282 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Jul 2024 23:44:31 +0200 Subject: [PATCH 283/302] unbreak again --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index e2faa1ab..6070febe 100755 --- a/debian/rules +++ b/debian/rules @@ -1174,6 +1174,10 @@ override_dh_auto_install: mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/; \ mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(LLVM_VERSION).1 $(DEB_INST)/usr/lib/$(DEB_HOST_MULTIARCH)/ + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so + cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ + ln -s ../../$(DEB_HOST_MULTIARCH)/libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so + # Not used on Linux. rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang/clang-format-bbedit.applescript From 9979ab1993b901853b00580b89751b51a3743722 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 28 Jul 2024 20:30:38 +0200 Subject: [PATCH 284/302] Unbreak the cmake tools --- debian/changelog | 6 ++++++ debian/llvm-X.Y-dev.install.in | 1 + debian/qualify-clang.sh | 4 ++-- debian/rules | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a098b20b..8afd73c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.8-7) unstable; urgency=medium + + * Unbreak the cmake tools + + -- Sylvestre Ledru Sun, 28 Jul 2024 09:49:06 +0200 + llvm-toolchain-18 (1:18.1.8-6) unstable; urgency=medium * Make libllvm multi arch ready again ... (Closes: #1076131) diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index d87daf09..1728cc90 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -3,6 +3,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a #usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so usr/lib/llvm-@LLVM_VERSION@/lib/libRemarks.* usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/ diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index cb7a2368..642792a3 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -33,12 +33,12 @@ fi # allow usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so # as it is in llvm-X.Y-dev NBLINES=$(ls -1 /usr/lib/llvm-$VERSION/lib/libLLVM*.so*|wc -l) -if test $NBLINES -ne 1; then +if test $NBLINES -ne 2; then echo "Found some libLLVM into /usr/lib/llvm-$VERSION/lib/" echo "See:" ls -al /usr/lib/llvm-$VERSION/lib/libLLVM*.so* echo "Break the build as it breaks the coinstalability" - echo "we should have only one for llvm-X.Y-dev" + echo "we should have only two for llvm-X.Y-dev" exit 1 fi diff --git a/debian/rules b/debian/rules index 6070febe..f1215c35 100755 --- a/debian/rules +++ b/debian/rules @@ -1176,7 +1176,8 @@ override_dh_auto_install: rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ - ln -s ../../$(DEB_HOST_MULTIARCH)/libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so + ln -s ../../$(DEB_HOST_MULTIARCH)/libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so; \ + ln -s ../../$(DEB_HOST_MULTIARCH)/libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so.1 # Not used on Linux. rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper From 26407375dbcbfd4a5c16659ff1ca0e3efc80a3b9 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 30 Jul 2024 09:19:10 +0200 Subject: [PATCH 285/302] Add patch from Emanuele Rocca, to make SVE types available in device targets --- debian/changelog | 7 ++- ...lvm-toolchain-17-sve-types-aux-target.diff | 56 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 debian/patches/llvm-toolchain-17-sve-types-aux-target.diff diff --git a/debian/changelog b/debian/changelog index b03ad600..84e1ea79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,7 @@ -llvm-toolchain-17 (1:17.0.6-13) UNRELEASED; urgency=medium +llvm-toolchain-17 (1:17.0.6-13) unstable; urgency=medium + + [ Emanuele Rocca ] + * Make SVE types available in device targets (Closes: #1076578) [ Matthias Klose ] * Pass --package-metadata on distros with supporting linkers (starting @@ -7,7 +10,7 @@ llvm-toolchain-17 (1:17.0.6-13) UNRELEASED; urgency=medium ELF_PACKAGE_METADATA. Setting NO_PKG_METADATA=1 disables the generation of the package metadata. - -- Matthias Klose Thu, 11 Jul 2024 09:10:08 +0200 + -- Gianfranco Costamagna Tue, 30 Jul 2024 09:15:47 +0200 llvm-toolchain-17 (1:17.0.6-12) unstable; urgency=medium diff --git a/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff b/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff new file mode 100644 index 00000000..2c0b74e3 --- /dev/null +++ b/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff @@ -0,0 +1,56 @@ +From: Emanuele Rocca +Date: Fri, 19 Jul 2024 09:25:38 +0200 +Subject: [PATCH] [Clang] make SVE types known to device targets too (#99446) + +For the purpose of preprocessing and declarations in header files, +ensure clang accepts SVE types for both device and host targets. + +Co-authored-by: Sander De Smalen +--- + clang/lib/AST/ASTContext.cpp | 3 ++- + clang/lib/Sema/Sema.cpp | 4 +++- + clang/test/PCH/aarch64-sve-types.c | 2 ++ + 3 files changed, 7 insertions(+), 2 deletions(-) + +Index: llvm-toolchain-17-17.0.6/clang/lib/AST/ASTContext.cpp +=================================================================== +--- llvm-toolchain-17-17.0.6.orig/clang/lib/AST/ASTContext.cpp ++++ llvm-toolchain-17-17.0.6/clang/lib/AST/ASTContext.cpp +@@ -1396,7 +1396,8 @@ void ASTContext::InitBuiltinTypes(const + #include "clang/Basic/OpenCLExtensionTypes.def" + } + +- if (Target.hasAArch64SVETypes()) { ++ if (Target.hasAArch64SVETypes() || ++ (AuxTarget && AuxTarget->hasAArch64SVETypes())) { + #define SVE_TYPE(Name, Id, SingletonId) \ + InitBuiltinType(SingletonId, BuiltinType::Id); + #include "clang/Basic/AArch64SVEACLETypes.def" +Index: llvm-toolchain-17-17.0.6/clang/lib/Sema/Sema.cpp +=================================================================== +--- llvm-toolchain-17-17.0.6.orig/clang/lib/Sema/Sema.cpp ++++ llvm-toolchain-17-17.0.6/clang/lib/Sema/Sema.cpp +@@ -423,7 +423,9 @@ void Sema::Initialize() { + #include "clang/Basic/OpenCLExtensionTypes.def" + } + +- if (Context.getTargetInfo().hasAArch64SVETypes()) { ++ if (Context.getTargetInfo().hasAArch64SVETypes() || ++ (Context.getAuxTargetInfo() && ++ Context.getAuxTargetInfo()->hasAArch64SVETypes())) { + #define SVE_TYPE(Name, Id, SingletonId) \ + addImplicitTypedef(Name, Context.SingletonId); + #include "clang/Basic/AArch64SVEACLETypes.def" +Index: llvm-toolchain-17-17.0.6/clang/test/PCH/aarch64-sve-types.c +=================================================================== +--- llvm-toolchain-17-17.0.6.orig/clang/test/PCH/aarch64-sve-types.c ++++ llvm-toolchain-17-17.0.6/clang/test/PCH/aarch64-sve-types.c +@@ -1,6 +1,8 @@ + // RUN: %clang_cc1 -triple aarch64-linux-gnu -emit-pch -o %t %s + // RUN: %clang_cc1 -triple aarch64-linux-gnu -include-pch %t \ + // RUN: -fsyntax-only -verify %s ++// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -aux-triple aarch64-linux-gnu \ ++// RUN: -x hip-cpp-output -emit-pch -o %t %s + + // expected-no-diagnostics + diff --git a/debian/patches/series b/debian/patches/series index f01fc78c..99f26dbb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -155,3 +155,4 @@ mips/D154390-pre-R6.diff libsanitizer-timebits.diff D154931-revert-loong64.patch link-with-package-metadata.diff +llvm-toolchain-17-sve-types-aux-target.diff From c9102bbce4b55b0561416f66eeeb13a49983d764 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 30 Jul 2024 10:07:10 +0200 Subject: [PATCH 286/302] Add patch from upstream and llvm-17 also to llvm-18 --- ...lvm-toolchain-17-sve-types-aux-target.diff | 56 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 57 insertions(+) create mode 100644 debian/patches/llvm-toolchain-17-sve-types-aux-target.diff diff --git a/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff b/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff new file mode 100644 index 00000000..23d14ffe --- /dev/null +++ b/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff @@ -0,0 +1,56 @@ +From: Emanuele Rocca +Date: Fri, 19 Jul 2024 09:25:38 +0200 +Subject: [PATCH] [Clang] make SVE types known to device targets too (#99446) + +For the purpose of preprocessing and declarations in header files, +ensure clang accepts SVE types for both device and host targets. + +Co-authored-by: Sander De Smalen +--- + clang/lib/AST/ASTContext.cpp | 3 ++- + clang/lib/Sema/Sema.cpp | 4 +++- + clang/test/PCH/aarch64-sve-types.c | 2 ++ + 3 files changed, 7 insertions(+), 2 deletions(-) + +Index: llvm-toolchain-17-17.0.6/clang/lib/AST/ASTContext.cpp +=================================================================== +--- llvm-toolchain-17-17.0.6.orig/clang/lib/AST/ASTContext.cpp ++++ llvm-toolchain-17-17.0.6/clang/lib/AST/ASTContext.cpp +@@ -1353,7 +1353,8 @@ void ASTContext::InitBuiltinTypes(const + #include "clang/Basic/OpenCLExtensionTypes.def" + } + +- if (Target.hasAArch64SVETypes()) { ++ if (Target.hasAArch64SVETypes() || ++ (AuxTarget && AuxTarget->hasAArch64SVETypes())) { + #define SVE_TYPE(Name, Id, SingletonId) \ + InitBuiltinType(SingletonId, BuiltinType::Id); + #include "clang/Basic/AArch64SVEACLETypes.def" +Index: llvm-toolchain-17-17.0.6/clang/lib/Sema/Sema.cpp +=================================================================== +--- llvm-toolchain-17-17.0.6.orig/clang/lib/Sema/Sema.cpp ++++ llvm-toolchain-17-17.0.6/clang/lib/Sema/Sema.cpp +@@ -424,7 +424,9 @@ void Sema::Initialize() { + #include "clang/Basic/OpenCLExtensionTypes.def" + } + +- if (Context.getTargetInfo().hasAArch64SVETypes()) { ++ if (Context.getTargetInfo().hasAArch64SVETypes() || ++ (Context.getAuxTargetInfo() && ++ Context.getAuxTargetInfo()->hasAArch64SVETypes())) { + #define SVE_TYPE(Name, Id, SingletonId) \ + addImplicitTypedef(Name, Context.SingletonId); + #include "clang/Basic/AArch64SVEACLETypes.def" +Index: llvm-toolchain-17-17.0.6/clang/test/PCH/aarch64-sve-types.c +=================================================================== +--- llvm-toolchain-17-17.0.6.orig/clang/test/PCH/aarch64-sve-types.c ++++ llvm-toolchain-17-17.0.6/clang/test/PCH/aarch64-sve-types.c +@@ -1,6 +1,8 @@ + // RUN: %clang_cc1 -triple aarch64-linux-gnu -emit-pch -o %t %s + // RUN: %clang_cc1 -triple aarch64-linux-gnu -include-pch %t \ + // RUN: -fsyntax-only -verify %s ++// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -aux-triple aarch64-linux-gnu \ ++// RUN: -x hip-cpp-output -emit-pch -o %t %s + + // expected-no-diagnostics + diff --git a/debian/patches/series b/debian/patches/series index 83715bf3..c18106e0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -154,3 +154,4 @@ ubuntu-releases.patch clang-record-gcc-switches-by-default.patch rename-libllvm.diff link-with-package-metadata.diff +llvm-toolchain-17-sve-types-aux-target.diff From bb97f43cbcf18e73495349f21cb75de1d0c504dc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 30 Jul 2024 10:49:33 +0200 Subject: [PATCH 287/302] Fix breaks/replaces (Closes: #1077587) --- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/control.in | 4 ++-- debian/rules | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52a4384b..58aa7a63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-18 (1:18.1.8-8) unstable; urgency=medium + + * Fix breaks/replaces (Closes: #1077587) + + -- Sylvestre Ledru Tue, 30 Jul 2024 10:48:59 +0200 + llvm-toolchain-18 (1:18.1.8-7) unstable; urgency=medium * Unbreak the cmake tools diff --git a/debian/control b/debian/control index e5af866e..774a7eee 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-18-dev (<< 1:18.1.8-4) -Replaces: llvm-18-dev (<< 1:18.1.8-4) +Breaks: llvm-18-dev (<< 1:18.1.8-8) +Replaces: llvm-18-dev (<< 1:18.1.8-8) 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 73ba6ea2..901b7daa 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:18.1.8-4) -Replaces: llvm-@LLVM_VERSION@-dev (<< 1:18.1.8-4) +Breaks: llvm-@LLVM_VERSION@-dev (<< 1:18.1.8-8) +Replaces: llvm-@LLVM_VERSION@-dev (<< 1:18.1.8-8) 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/rules b/debian/rules index f1215c35..5e6d72fa 100755 --- a/debian/rules +++ b/debian/rules @@ -683,7 +683,7 @@ stamps/preconfigure: # Yeah, this is ugly but I don't know how to do better if test "$(LLVM_VERSION)" = "18"; then \ if echo $(LLVM_VERSION_SNAPSHOT)| grep -q "~++"; then \ - sed -i -e "s| (<< 1:18.1.8-4)|(<< 1:18.1.8~++20240717045021)|g" debian/control; \ + sed -i -e "s| (<< 1:18.1.8-8)|(<< 1:18.1.8~++20240730104741)|g" debian/control; \ fi; \ fi From 3228430772ab9c5919ed286f04d3266dca3b0a15 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 30 Jul 2024 11:20:43 +0200 Subject: [PATCH 288/302] Mention in changelog also the SVE fixes from llvm-17 --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 58aa7a63..0751d11f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ llvm-toolchain-18 (1:18.1.8-8) unstable; urgency=medium + [ Sylvestre Ledru ] * Fix breaks/replaces (Closes: #1077587) + [ Gianfranco Costamagna ] + * Merge llvm-toolchain-17 1:17.0.6-13 into llvm-18 branch + - Make SVE types available in device targets (Closes: #1076578) + -- Sylvestre Ledru Tue, 30 Jul 2024 10:48:59 +0200 llvm-toolchain-18 (1:18.1.8-7) unstable; urgency=medium From a7a25a5229fb0cacb3cab2256dc5b4412b54cee8 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 1 Aug 2024 12:15:06 +0200 Subject: [PATCH 289/302] Drop mips D154390 patch, already upstream --- debian/patches/mips/D154390-pre-R6.diff | 41 ------------------------- debian/patches/series | 1 - 2 files changed, 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 f311b6e9..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_18~++20240117091415+da0755f7b7cc/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 @@ - - #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 -@@ -76,6 +78,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 c18106e0..c8309240 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -148,7 +148,6 @@ link-grpc.diff libclang-major-version-only.diff D148945-revert.diff arm32-defaults.diff -mips/D154390-pre-R6.diff libsanitizer-timebits.diff ubuntu-releases.patch clang-record-gcc-switches-by-default.patch From 275f08ab0fdde29a102d92fa2faa1336fc9ff430 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 1 Aug 2024 12:15:46 +0200 Subject: [PATCH 290/302] Update changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0751d11f..1badae94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-18 (1:18.1.8-9) UNRELEASED; urgency=medium + + [ Gianfranco Costamagna ] + * Mention in changelog also the SVE fixes from llvm-17 + * Drop mips D154390 patch, already upstream + + -- Gianfranco Costamagna Thu, 01 Aug 2024 12:15:23 +0200 + llvm-toolchain-18 (1:18.1.8-8) unstable; urgency=medium [ Sylvestre Ledru ] From 4bd169224c95bb648c15ccb922e97de589b69594 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 3 Aug 2024 20:08:17 +0200 Subject: [PATCH 291/302] Really fix breaks/replaces (Closes: #1077587) --- debian/changelog | 8 ++++++-- debian/control.in | 2 ++ debian/rules | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1badae94..9360664a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -llvm-toolchain-18 (1:18.1.8-9) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.8-9) unstable; urgency=medium [ Gianfranco Costamagna ] * Mention in changelog also the SVE fixes from llvm-17 * Drop mips D154390 patch, already upstream - -- Gianfranco Costamagna Thu, 01 Aug 2024 12:15:23 +0200 + + [ Sylvestre Ledru ] + * Really fix breaks/replaces (Closes: #1077587) + + -- Sylvestre Ledru Sat, 03 Aug 2024 20:07:17 +0200 llvm-toolchain-18 (1:18.1.8-8) unstable; urgency=medium diff --git a/debian/control.in b/debian/control.in index 901b7daa..7432ec67 100644 --- a/debian/control.in +++ b/debian/control.in @@ -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}), libz3-dev, libxml2-dev +Breaks: libllvm@LLVM_VERSION@ (<< 1:18.1.8-9) +Replaces: libllvm@LLVM_VERSION@ (<< 1:18.1.8-9) 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 5e6d72fa..e112d4ad 100755 --- a/debian/rules +++ b/debian/rules @@ -683,7 +683,8 @@ stamps/preconfigure: # Yeah, this is ugly but I don't know how to do better if test "$(LLVM_VERSION)" = "18"; then \ if echo $(LLVM_VERSION_SNAPSHOT)| grep -q "~++"; then \ - sed -i -e "s| (<< 1:18.1.8-8)|(<< 1:18.1.8~++20240730104741)|g" debian/control; \ + sed -i -e "s| (<< 1:18.1.8-9)|(<< 1:18.1.8~++20240830304741)|g" debian/control; \ + sed -i -e "s| (<< 1:18.1.8-9)|(<< 1:18.1.8~++20240830304741)|g" debian/control; \ fi; \ fi From 0571e423300c0efcb40f70b078abeed9f6f2c860 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 6 Aug 2024 16:11:47 +0200 Subject: [PATCH 292/302] regenerate the control file --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 774a7eee..7f22646d 100644 --- a/debian/control +++ b/debian/control @@ -422,6 +422,8 @@ 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}), libz3-dev, libxml2-dev +Breaks: libllvm18 (<< 1:18.1.8-9) +Replaces: libllvm18 (<< 1:18.1.8-9) 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 From 970848badedef172d0179a14d631844ac0d736d1 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 6 Aug 2024 16:13:46 +0200 Subject: [PATCH 293/302] * ld.lld: When no package-metadata option is given, fall-back to the envvar ELF_PACKAGE_METADATA. --- debian/changelog | 7 +++++++ debian/patches/env-lld-package-metadata.diff | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 24 insertions(+) create mode 100644 debian/patches/env-lld-package-metadata.diff diff --git a/debian/changelog b/debian/changelog index 9360664a..93363d32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-18 (1:18.1.8-10) 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:13:21 +0200 + llvm-toolchain-18 (1:18.1.8-9) unstable; urgency=medium [ Gianfranco Costamagna ] 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 c8309240..ae7d3fc6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -154,3 +154,4 @@ clang-record-gcc-switches-by-default.patch rename-libllvm.diff link-with-package-metadata.diff llvm-toolchain-17-sve-types-aux-target.diff +env-lld-package-metadata.diff From be3b319d2d99b755a930f3c9611f4f12dba246ca Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Thu, 15 Aug 2024 10:43:18 +0200 Subject: [PATCH 294/302] Enable bolt on arm64, now supported upstream --- debian/changelog | 4 ++++ debian/control | 6 ++---- debian/control.in | 6 ++---- debian/libbolt-X.Y-dev.install.in | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93363d32..77375cea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-18 (1:18.1.8-10) UNRELEASED; urgency=medium + [ Matthias Klose ] * ld.lld: When no package-metadata option is given, fall-back to the envvar ELF_PACKAGE_METADATA. + [ Emanuele Rocca ] + * Enable bolt on arm64, now supported upstream. + -- Matthias Klose Tue, 06 Aug 2024 16:13:21 +0200 llvm-toolchain-18 (1:18.1.8-9) unstable; urgency=medium diff --git a/debian/control b/debian/control index 7f22646d..4d48a096 100644 --- a/debian/control +++ b/debian/control @@ -917,8 +917,7 @@ Description: Multi-Level Intermediate Representation library # ------------- bolt ------------- Package: bolt-18 -Architecture: amd64 -# Disable on arm64 because libbolt_rt_hugify.a isn't generated +Architecture: amd64 arm64 Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-18-dev (= ${binary:Version}), Pre-Depends: ${misc:Pre-Depends} Description: Post-link optimizer @@ -927,8 +926,7 @@ Description: Post-link optimizer Package: libbolt-18-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 7432ec67..cc556cde 100644 --- a/debian/control.in +++ b/debian/control.in @@ -917,8 +917,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 @@ -927,8 +926,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 25275086c28360e3591f99f8de3ea3350e51fcf2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 7 Sep 2024 23:09:15 +0200 Subject: [PATCH 295/302] Backport two commits to fix riscv64 issue. (Closes: #1080435) --- debian/changelog | 7 +- ...lvm-toolchain-17-sve-types-aux-target.diff | 22 ++-- debian/patches/rv64-fix-PCREL_HI20-issue.diff | 104 ++++++++++++++++++ debian/patches/rv64-fix-mm-leak.diff | 33 ++++++ debian/patches/series | 3 + 5 files changed, 153 insertions(+), 16 deletions(-) create mode 100644 debian/patches/rv64-fix-PCREL_HI20-issue.diff create mode 100644 debian/patches/rv64-fix-mm-leak.diff diff --git a/debian/changelog b/debian/changelog index 77375cea..776883c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-18 (1:18.1.8-10) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.8-10) unstable; urgency=medium [ Matthias Klose ] * ld.lld: When no package-metadata option is given, fall-back @@ -7,7 +7,10 @@ llvm-toolchain-18 (1:18.1.8-10) UNRELEASED; urgency=medium [ Emanuele Rocca ] * Enable bolt on arm64, now supported upstream. - -- Matthias Klose Tue, 06 Aug 2024 16:13:21 +0200 + [ Bo YU ] + * Backport two commits to fix riscv64 issue. (Closes: #1080435) + + -- Sylvestre Ledru Sat, 07 Sep 2024 23:08:26 +0200 llvm-toolchain-18 (1:18.1.8-9) unstable; urgency=medium diff --git a/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff b/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff index 23d14ffe..64445558 100644 --- a/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff +++ b/debian/patches/llvm-toolchain-17-sve-types-aux-target.diff @@ -12,11 +12,9 @@ Co-authored-by: Sander De Smalen clang/test/PCH/aarch64-sve-types.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) -Index: llvm-toolchain-17-17.0.6/clang/lib/AST/ASTContext.cpp -=================================================================== ---- llvm-toolchain-17-17.0.6.orig/clang/lib/AST/ASTContext.cpp -+++ llvm-toolchain-17-17.0.6/clang/lib/AST/ASTContext.cpp -@@ -1353,7 +1353,8 @@ void ASTContext::InitBuiltinTypes(const +--- a/clang/lib/AST/ASTContext.cpp ++++ b/clang/lib/AST/ASTContext.cpp +@@ -1353,7 +1353,8 @@ #include "clang/Basic/OpenCLExtensionTypes.def" } @@ -26,11 +24,9 @@ Index: llvm-toolchain-17-17.0.6/clang/lib/AST/ASTContext.cpp #define SVE_TYPE(Name, Id, SingletonId) \ InitBuiltinType(SingletonId, BuiltinType::Id); #include "clang/Basic/AArch64SVEACLETypes.def" -Index: llvm-toolchain-17-17.0.6/clang/lib/Sema/Sema.cpp -=================================================================== ---- llvm-toolchain-17-17.0.6.orig/clang/lib/Sema/Sema.cpp -+++ llvm-toolchain-17-17.0.6/clang/lib/Sema/Sema.cpp -@@ -424,7 +424,9 @@ void Sema::Initialize() { +--- a/clang/lib/Sema/Sema.cpp ++++ b/clang/lib/Sema/Sema.cpp +@@ -424,7 +424,9 @@ #include "clang/Basic/OpenCLExtensionTypes.def" } @@ -41,10 +37,8 @@ Index: llvm-toolchain-17-17.0.6/clang/lib/Sema/Sema.cpp #define SVE_TYPE(Name, Id, SingletonId) \ addImplicitTypedef(Name, Context.SingletonId); #include "clang/Basic/AArch64SVEACLETypes.def" -Index: llvm-toolchain-17-17.0.6/clang/test/PCH/aarch64-sve-types.c -=================================================================== ---- llvm-toolchain-17-17.0.6.orig/clang/test/PCH/aarch64-sve-types.c -+++ llvm-toolchain-17-17.0.6/clang/test/PCH/aarch64-sve-types.c +--- a/clang/test/PCH/aarch64-sve-types.c ++++ b/clang/test/PCH/aarch64-sve-types.c @@ -1,6 +1,8 @@ // RUN: %clang_cc1 -triple aarch64-linux-gnu -emit-pch -o %t %s // RUN: %clang_cc1 -triple aarch64-linux-gnu -include-pch %t \ diff --git a/debian/patches/rv64-fix-PCREL_HI20-issue.diff b/debian/patches/rv64-fix-PCREL_HI20-issue.diff new file mode 100644 index 00000000..bbb10de6 --- /dev/null +++ b/debian/patches/rv64-fix-PCREL_HI20-issue.diff @@ -0,0 +1,104 @@ +From 78f39dc70c1feaea5130b90ea3fb7b3ddd62446b Mon Sep 17 00:00:00 2001 +From: Jonas Hahnfeld +Date: Mon, 12 Feb 2024 19:45:52 +0100 +Subject: [PATCH] [JITLink][RISCV] Use hashmap to find PCREL_HI20 edge (#78849) + +As noted in issues #68594 and #73935, `JITLink/RISCV/ELF_ehframe.s` +fails with libstdc++'s expensive checks because `getRISCVPCRelHi20` +calls `std::equal_range` on the edges which may not be ordered by their +offset. Instead let `ELFJITLinker_riscv` build a hashmap of all edges +with type `R_RISCV_PCREL_HI20` that can be looked up in constant time. + +Bugs: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1080435 + +Closes #73935 +--- + .../lib/ExecutionEngine/JITLink/ELF_riscv.cpp | 68 ++++++++++--------- + 1 file changed, 35 insertions(+), 33 deletions(-) + +--- a/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp ++++ b/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp +@@ -133,38 +133,6 @@ + namespace llvm { + namespace jitlink { + +-static Expected getRISCVPCRelHi20(const Edge &E) { +- using namespace riscv; +- assert((E.getKind() == R_RISCV_PCREL_LO12_I || +- E.getKind() == R_RISCV_PCREL_LO12_S) && +- "Can only have high relocation for R_RISCV_PCREL_LO12_I or " +- "R_RISCV_PCREL_LO12_S"); +- +- const Symbol &Sym = E.getTarget(); +- const Block &B = Sym.getBlock(); +- orc::ExecutorAddrDiff Offset = Sym.getOffset(); +- +- struct Comp { +- bool operator()(const Edge &Lhs, orc::ExecutorAddrDiff Offset) { +- return Lhs.getOffset() < Offset; +- } +- bool operator()(orc::ExecutorAddrDiff Offset, const Edge &Rhs) { +- return Offset < Rhs.getOffset(); +- } +- }; +- +- auto Bound = +- std::equal_range(B.edges().begin(), B.edges().end(), Offset, Comp{}); +- +- for (auto It = Bound.first; It != Bound.second; ++It) { +- if (It->getKind() == R_RISCV_PCREL_HI20) +- return *It; +- } +- +- return make_error( +- "No HI20 PCREL relocation type be found for LO12 PCREL relocation type"); +-} +- + static uint32_t extractBits(uint32_t Num, unsigned Low, unsigned Size) { + return (Num & (((1ULL << Size) - 1) << Low)) >> Low; + } +@@ -184,9 +152,43 @@ + public: + ELFJITLinker_riscv(std::unique_ptr Ctx, + std::unique_ptr G, PassConfiguration PassConfig) +- : JITLinker(std::move(Ctx), std::move(G), std::move(PassConfig)) {} ++ : JITLinker(std::move(Ctx), std::move(G), std::move(PassConfig)) { ++ JITLinkerBase::getPassConfig().PostAllocationPasses.push_back( ++ [this](LinkGraph &G) { return gatherRISCVPCRelHi20(G); }); ++ } + + private: ++ DenseMap, const Edge *> ++ RelHi20; ++ ++ Error gatherRISCVPCRelHi20(LinkGraph &G) { ++ for (Block *B : G.blocks()) ++ for (Edge &E : B->edges()) ++ if (E.getKind() == R_RISCV_PCREL_HI20) ++ RelHi20[{B, E.getOffset()}] = &E; ++ ++ return Error::success(); ++ } ++ ++ Expected getRISCVPCRelHi20(const Edge &E) const { ++ using namespace riscv; ++ assert((E.getKind() == R_RISCV_PCREL_LO12_I || ++ E.getKind() == R_RISCV_PCREL_LO12_S) && ++ "Can only have high relocation for R_RISCV_PCREL_LO12_I or " ++ "R_RISCV_PCREL_LO12_S"); ++ ++ const Symbol &Sym = E.getTarget(); ++ const Block &B = Sym.getBlock(); ++ orc::ExecutorAddrDiff Offset = Sym.getOffset(); ++ ++ auto It = RelHi20.find({&B, Offset}); ++ if (It != RelHi20.end()) ++ return *It->second; ++ ++ return make_error("No HI20 PCREL relocation type be found " ++ "for LO12 PCREL relocation type"); ++ } ++ + Error applyFixup(LinkGraph &G, Block &B, const Edge &E) const { + using namespace riscv; + using namespace llvm::support; diff --git a/debian/patches/rv64-fix-mm-leak.diff b/debian/patches/rv64-fix-mm-leak.diff new file mode 100644 index 00000000..9442b74f --- /dev/null +++ b/debian/patches/rv64-fix-mm-leak.diff @@ -0,0 +1,33 @@ +From 3d67cf681a728e4cf0ab9947c0dd07539dda8b74 Mon Sep 17 00:00:00 2001 +From: Min-Yih Hsu +Date: Fri, 16 Feb 2024 16:19:56 -0800 +Subject: [PATCH] [JITLink] Always unmap standard segments in + InProcessMemoryManager::deallocate (#81943) + +Right now InProcessMemoryManager only releases a standard segment (via +sys::Memory::releaseMappedMemory) in `deallocate` when there is a +DeallocAction associated, leaving residual memory pages in the process +until termination. +Despite being a de facto memory leak, it won't cause a major issue if +users only create a single LLJIT instance per process, which is the most +common use cases. It will, however, drain virtual memory pages if we +create thousands of ephemeral LLJIT instances in the same process. + +This patch fixes this issue by releasing every standard segments +regardless of the attached DeallocAction. +--- + llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp ++++ b/llvm/lib/ExecutionEngine/JITLink/JITLinkMemoryManager.cpp +@@ -449,8 +449,7 @@ + for (auto &Alloc : Allocs) { + auto *FA = Alloc.release().toPtr(); + StandardSegmentsList.push_back(std::move(FA->StandardSegments)); +- if (!FA->DeallocActions.empty()) +- DeallocActionsList.push_back(std::move(FA->DeallocActions)); ++ DeallocActionsList.push_back(std::move(FA->DeallocActions)); + FA->~FinalizedAllocInfo(); + FinalizedAllocInfos.Deallocate(FA); + } diff --git a/debian/patches/series b/debian/patches/series index ae7d3fc6..9752a177 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -155,3 +155,6 @@ rename-libllvm.diff link-with-package-metadata.diff llvm-toolchain-17-sve-types-aux-target.diff env-lld-package-metadata.diff + +rv64-fix-PCREL_HI20-issue.diff +rv64-fix-mm-leak.diff From ef7221dbda7ad814dcb19b210cfa9eb425deb9a3 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 9 Sep 2024 08:24:01 +0200 Subject: [PATCH 296/302] Drop ocaml on armhf, ocamlopt disappeared making build ftbfs --- debian/control | 10 +++++----- debian/control.in | 10 +++++----- debian/rules | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 4d48a096..5aa53557 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 sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, 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], - 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 @@ -462,7 +462,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-18-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el s390x riscv64 +Architecture: amd64 arm64 ppc64el s390x riscv64 Suggests: llvm-18-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-18-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/control.in b/debian/control.in index cc556cde..d157100e 100644 --- a/debian/control.in +++ b/debian/control.in @@ -19,10 +19,10 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, 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], - 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 @@ -462,7 +462,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-@LLVM_VERSION@-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el s390x riscv64 +Architecture: amd64 arm64 ppc64el s390x riscv64 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 e112d4ad..0c13266e 100755 --- a/debian/rules +++ b/debian/rules @@ -530,7 +530,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 d22f7c94c69f2c23ee9ed3ec004ae01c216fea30 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 9 Sep 2024 08:24:17 +0200 Subject: [PATCH 297/302] Drop extra space in changelog --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 776883c5..2046f317 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,6 @@ llvm-toolchain-18 (1:18.1.8-9) unstable; urgency=medium * Mention in changelog also the SVE fixes from llvm-17 * Drop mips D154390 patch, already upstream - [ Sylvestre Ledru ] * Really fix breaks/replaces (Closes: #1077587) From 754b99da4b02b094f471ab0e5d1d919e2fc5e4de Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 9 Sep 2024 08:27:17 +0200 Subject: [PATCH 298/302] Sync spirv architectures with sid builds --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 5aa53557..39e332b5 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-18 [amd64 arm64 armhf i386 ppc64el mips64el riscv64 s390x ppc64 hurd-i386 loong64 sparc64 x32] | hello [amd64 arm64 armhf i386 ppc64el mips64el riscv64 s390x ppc64 hurd-i386 loong64 sparc64 x32] , 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 d157100e..b4cabfbf 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-18 [amd64 arm64 armhf i386 ppc64el mips64el riscv64 s390x ppc64 hurd-i386 loong64 sparc64 x32] | hello [amd64 arm64 armhf i386 ppc64el mips64el riscv64 s390x ppc64 hurd-i386 loong64 sparc64 x32] , spirv-tools [linux-any] | hello [linux-any], wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev , From be065253321d1dd7e3987d5cde798d14e52e2290 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 9 Sep 2024 08:28:07 +0200 Subject: [PATCH 299/302] Fix x32 build failure due to orc library not being installed --- debian/libclang-rt-X.Y-dev.install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index 4946d9d2..670f2c60 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/*/liborc_rt* +[amd64 arm64 armhf armel i386 ppc64 ppc64el x32] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/liborc_rt* From 1d5fe2cbe5b5f338732fdd1beedea189830c5341 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 9 Sep 2024 08:41:26 +0200 Subject: [PATCH 300/302] Add back LLVM_EXPERIMENTAL_TARGETS_TO_BUILD to PASSTHROUGH variables, to help m68k --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 0c13266e..f66bcc7d 100755 --- a/debian/rules +++ b/debian/rules @@ -840,7 +840,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_EXPERIMENTAL_TARGETS_TO_BUILD" \ -DBOOTSTRAP_CMAKE_BUILD_TYPE=RelWithDebInfo \ -DBOOTSTRAP_CMAKE_C_FLAGS_RELWITHDEBINFO="$(opt_flags)" \ -DBOOTSTRAP_CMAKE_CXX_FLAGS_RELWITHDEBINFO="$(opt_flags)" \ From 57833aed3b4867c164d6eb47bdd99b019cc3a21e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 9 Sep 2024 08:45:25 +0200 Subject: [PATCH 301/302] Update changelog --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2046f317..f1a9caca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +llvm-toolchain-18 (1:18.1.8-11) UNRELEASED; urgency=medium + + * Drop ocaml on armhf, ocamlopt disappeared making build ftbfs + * Drop extra space in changelog + * Sync spirv architectures with sid builds + * Fix x32 build failure due to orc library not being installed + * Add back LLVM_EXPERIMENTAL_TARGETS_TO_BUILD to PASSTHROUGH variables, to help m68k + + -- Gianfranco Costamagna Mon, 09 Sep 2024 08:42:27 +0200 + llvm-toolchain-18 (1:18.1.8-10) unstable; urgency=medium [ Matthias Klose ] From 50fdb56cbef53fd654b55b5bf829ad27399a32e7 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 9 Sep 2024 10:47:37 +0200 Subject: [PATCH 302/302] Upload to sid --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f1a9caca..fc885bbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-18 (1:18.1.8-11) UNRELEASED; urgency=medium +llvm-toolchain-18 (1:18.1.8-11) unstable; urgency=medium * Drop ocaml on armhf, ocamlopt disappeared making build ftbfs * Drop extra space in changelog