From 6b5f8935a3bb0527dd8f25da0beaf0214c47dc43 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 26 Jan 2024 09:46:26 +0100 Subject: [PATCH 01/27] 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 02/27] 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 03/27] 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 04/27] 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 05/27] 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 06/27] 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 07/27] 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 08/27] 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 09/27] 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 10/27] 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 11/27] 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 12/27] 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 13/27] 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 14/27] 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 15/27] 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 16/27] 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 17/27] 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 18/27] 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 19/27] 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 20/27] 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 21/27] 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 22/27] 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 23/27] 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 24/27] 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 25/27] 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 26/27] 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 27/27] 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