From: Peter Michael Green Date: Thu, 30 May 2024 19:05:46 +0000 (+0000) Subject: Merge tag '1%16.0.6-15+rpi1' from llvm-toolchain-16 packaging into llvm-toolchain... X-Git-Tag: archive/raspbian/1%19.1.3-1+rpi1^2^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3042c258ec3e25472ab765f815a99621d7feae18;p=llvm-toolchain-19.git Merge tag '1%16.0.6-15+rpi1' from llvm-toolchain-16 packaging into llvm-toolchain-17 packaging --- 3042c258ec3e25472ab765f815a99621d7feae18 diff --cc debian/changelog index 1481fc308d,70e7020ecf..b9b91679f1 --- a/debian/changelog +++ b/debian/changelog @@@ -1,348 -1,49 +1,395 @@@ -llvm-toolchain-16 (1:16.0.6-15+rpi1) trixie-staging; urgency=medium ++llvm-toolchain-17 (1:17.0.6-5+rpi1) trixie-staging; urgency=medium + + [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green at Sat, 14 May 2016 21:43:35 +0000] + * Cleanup .pyc files in clean target. + * Add a hack to the cmake based build to force armv6 (unfortunately the cmake + based build relies on config.guess which assumes you want to build for the + hardware you are running on). + * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that + are broken on lower arm architectures. + + [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green] + * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously). + * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake + * Clean up debian/usr in clean target. + * Clean up clang/tools/*-3.9 in clean target. + * Clean up stray *3.9.vim files + * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc + * Clean up debian/*.install + + [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green] + * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain + about it not existing. + * clean up more crap left behind by build process. + + [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green] + * Remove debian/man in clean target. + + [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green] + * Use libatomic on armhf + * Set cmake/config.guess.hack back to mode 644 in clean target to keep + git/dgit happy. + * Yet more clean target fixes. + + [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green] + * Change triplet in debian/rules to use armv6k rather than armv7l + + [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green] + * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated. + + [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green] + * Disable scudo on armhf, it needs atomics which we do not want to enable. + + [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green at Tue, 23 Nov 2021 22:37:30 +0000] + * Remove armhf from architecture list for libunwind-13-dev dependency. + - -- Peter Michael Green Tue, 26 Sep 2023 23:43:02 +0000 ++ -- Peter Michael Green Thu, 30 May 2024 19:02:37 +0000 ++ +llvm-toolchain-17 (1:17.0.6-5) unstable; urgency=medium + + [ Faidon Liambotis ] + * Revert "Enable COMPILER_RT_BUILD_BUILTINS for armel" + * Fix i386 FTBFS resulting from COMPILER_RT_DEFAULT_TARGET_ONLY + (Closes: #1060440) + + -- Sylvestre Ledru Thu, 11 Jan 2024 14:15:09 +0100 + +llvm-toolchain-17 (1:17.0.6-4) unstable; urgency=medium + + * debian/qualify-clang.sh: remove the compiler-rt test of i386 + use libclang-rt-17-dev:i386 instead + + [ Matthias Klose ] + * libclang1-17: Remove the full version symlinks. + + [ Faidon Liambotis ] + * Enable COMPILER_RT_DEFAULT_TARGET_ONLY for all archs + * Enable COMPILER_RT_BUILD_BUILTINS for armel + * Drop two unreferenced debian/patches + * Mark documentation packages as Multi-Arch: foreign + * Convert libclang-common-*-dev to Arch: all/M-A: foreign + + -- Sylvestre Ledru Tue, 09 Jan 2024 13:03:56 +0100 + +llvm-toolchain-17 (1:17.0.6-3) unstable; urgency=medium + + * Cherry pick the wasm fix from 16 + (Closes: #1057838) + + -- Sylvestre Ledru Fri, 15 Dec 2023 18:51:57 +0100 + +llvm-toolchain-17 (1:17.0.6-2) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Add new cmake-clang-test to spot issues such as + Debian bug #1057151 + * Fix cmake file (Closes: #1057151) + * Drop sed command, useless now + + [ Matthias Klose ] + * Also use the free swap to determine the number of parallel processes. + * libclang1-17: Hard-code the last full versions for the symlinks. + * Also use the free swap to determine the number of parallel processes. + * Set the cpu defaults for the ARM32 architectures: + - armel: arm926ej-s. Closes: #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 ] + * Move the symlink /usr/lib/*/libc++experimental.a from libc++abi-17-dev + to libc++-17-dev + * Remove some old break/replaces from 16 + * Fix the EmitBackendOutput test in debian/qualify-clang.sh + * Also add back /usr/lib/llvm-17/lib/libclang-17.so.1 + + -- Gianfranco Costamagna Fri, 08 Dec 2023 09:49:04 +0100 + +llvm-toolchain-17 (1:17.0.6-1) unstable; urgency=medium + + [ Matthias Klose ] + * Further limit the number of parallel processes + * Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not + yet built on these architectures). + * Fix stripping build flags on Ubuntu/ppc64el. + * libclang1-17: Only encode the major version in the soname. Closes: #1056126. + * libclang1-17: Provide a symlink for the last soname with the full version. + * Restore the patch for D148945, searching /usr/lib/llvm-17/lib by default. + Closes: #1056580. + + [ Sylvestre Ledru ] + * New upstream release + * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a + to fix https://github.com/llvm/llvm-project/issues/72753 + * try to relax the wasi-libc dep declaration for apt.llvm.org + * add a check that, if we are going to build wasm, wasi-libc is installed + on the system + + [ John Paul Adrian Glaubitz ] + * Don't install *clang_rt* on sparc and sparc64 + + -- Sylvestre Ledru Tue, 28 Nov 2023 11:43:43 +0100 + +llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Don't run chrpath for libclang on sparc and sparc64 + + [ Matthias Klose ] + * Build-depend on llvm-spirv-17. + + [ Sylvestre Ledru ] + * New upstream release + + -- Sylvestre Ledru Tue, 14 Nov 2023 11:27:22 +0100 + +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). + + [ Sylvestre Ledru ] + * New supstream release + * Upload to unstable + + -- Sylvestre Ledru Tue, 31 Oct 2023 11:39:22 +0100 + +llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium + + [ 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. + * 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. + * d/rules/preconfigure: Print info about build environment. + + [ 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 + + * New upstream release + + -- Sylvestre Ledru Tue, 03 Oct 2023 09:18:45 +0200 + +llvm-toolchain-17 (1:17.0.1-1~exp2) experimental; urgency=medium + + * Also remove omp from cmake file (Closes: #1052533) + + -- Gianfranco Costamagna Thu, 28 Sep 2023 11:24:39 +0200 + +llvm-toolchain-17 (1:17.0.1-1~exp1) experimental; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Tue, 19 Sep 2023 10:43:02 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp6) experimental; urgency=medium + + * Enable again python3-lldb on bionic (apt.llvm.org) + + -- Sylvestre Ledru Mon, 18 Sep 2023 11:22:37 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp5) experimental; urgency=medium + + * debian/patches/D158066.patch: + - cherry-pick change from 1:16.0.6-11 + * Make sure at least spirv 17 is used, FTBFS with older version + + -- Gianfranco Costamagna Tue, 12 Sep 2023 08:51:38 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp4) experimental; urgency=medium + + [ Gianfranco Costamagna ] + * Don't depend on spirv, the version 16 is too old to work + + [ Sylvestre Ledru ] + * Also ignore "-mbranch-protection=standard" (used on arm64) + + -- Sylvestre Ledru Fri, 08 Sep 2023 13:49:38 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp3) experimental; urgency=medium + + * Update control file + * Fixup build failures from 16 branch + + -- Gianfranco Costamagna Thu, 07 Sep 2023 23:04:28 +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 + * Explicitly depend on libcurl4-openssl-dev + Thanks to Samuel Henrique for the fix + + -- Sylvestre Ledru Wed, 06 Sep 2023 22:44:15 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Disable wasm support on powerpc and powerpcspe + * Remove powerpc from BINUTILS_GOLD_ARCHS again + + [ Sylvestre Ledru ] + * new upstream release + * Disable python3-lldb on mips64el to unbreak the build + + -- Sylvestre Ledru Tue, 05 Sep 2023 14:30:50 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Tue, 22 Aug 2023 19:22:57 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc2-1~exp2) UNRELEASED; urgency=medium + + * debian/tests/control: update gcc to 10 => 13 + + -- Sylvestre Ledru Sat, 19 Aug 2023 10:07:19 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium + + * New snapshot release: + * Fix the libclang-rt-17-dev: ships + /usr/lib[...]/wasi/libclang_rt.builtins-wasm*.a, already in + libclang-rt-17-dev-wasm* (closes: #1041388) + * Also install llvm-debuginfod in llvm-X.Y + * Fix for real the libclang-rt-17-dev issue + + -- 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 + in libclang-common-X.Y-dev + * fix the libclang & libomp5 symbol files + * Add new symbol to libclang1: + clang_CXXMethod_isExplicit + clang_createIndexWithOptions + clang_getBinaryOperatorKindSpelling + clang_getCursorBinaryOperatorKind + clang_getCursorUnaryOperatorKind + clang_getUnaryOperatorKindSpelling + + [ Samuel Thibault ] + * Fix hurd build by fixing Linux-specific lines. + + -- Sylvestre Ledru Sun, 09 Jul 2023 15:15:34 +0200 + +llvm-toolchain-snapshot (1:17~++20230701095046+dc6c8b8d1e35-1~exp1) experimental; urgency=medium + + * llvm-debuginfod not installed anymore + https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225 + * New snapshot release + * Yet a new element (omp) to disable in cmake detection. Upstream #62622 + * remove some mlir example (libMyExtensionCh*.a) + * Try to pass MAKE_C_COMPILER_LAUNCHER and CMAKE_CXX_COMPILER_LAUNCHER + in CLANG_BOOTSTRAP_PASSTHROUGH for sccache in stage2 + * Disable python3-lldb-17 for buster (it has been this way for a while) + * Try to workaround issue 63613 + + -- Sylvestre Ledru Tue, 04 Jul 2023 13:16:48 +0200 + +llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium + + * Snapshot is now 17 + * ship libHLFIRTransforms & libHLFIRDialect in libflang + * Also install liborc_rt-x86_64.a in libclang-rt + * Adjust some path since upstream changed the path from + /usr/lib/llvm-16/lib/clang/16.0.0/ to + /usr/lib/llvm-16/lib/clang/16/ + * Workaround some missing files on buster + * Replace LLVM_CONFIG by LLVM_CMAKE_DIR + * Bring back -DBUILTINS_CMAKE_ARGS & -DRUNTIMES_CMAKE_ARGS options + https://github.com/llvm/llvm-project/issues/59097 + * unbreak a symlink to fix to libclang + * Add a symlink /usr/lib/x86_64-linux-gnu/{libclang-16.so.16.0.0 => libclang-16.so.1} + Expected by program like the firefox build system + * ship amdgpu-arch & nvptx-arch in clang-tools + * ship llvm-omp-kernel-replay in libomp-X.Y-dev + * Disable flang on s390x. Seems that it is breaking + * compiler-rt: Only build liborc on amd64, i386 & arm64 + * Don't build omptarget on i386 + + -- Sylvestre Ledru Sat, 28 Jan 2023 18:07:40 +0100 + +llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Upload to sid + + [ Sylvestre Ledru ] + * Change the logic to disable SPIRV. Disable it on most of the versions because + it needs llvm-spirv-16. + Enabled on trixie/sid, Ubuntu Mantic + FAILED: spirv-mesa3d-.spv /build/source/libclc/build/spirv-mesa3d-.spv + cd /build/source/libclc/build && /usr/bin/llvm-spirv-15 + --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc + Unknown attribute kind (86) (Producer: 'LLVM16.0.6' Reader: 'LLVM 15.0.6') + * For Ubuntu bionic, improve the deactivation of lldb python + + [ Steve Langasek ] + * Add noble as supported Ubuntu release + + [ John Paul Adrian Glaubitz ] + * Don't run chrpath for libclang on sparc and sparc64 + + [ Sylvestre Ledru ] + + -- Sylvestre Ledru Sat, 11 Nov 2023 09:57:35 +0100 + +llvm-toolchain-16 (1:16.0.6-17exp1) experimental; urgency=medium + + * Fixup the move from all to any + * Update debian/README documentation + + -- Gianfranco Costamagna Tue, 24 Oct 2023 12:38:21 +0200 + +llvm-toolchain-16 (1:16.0.6-17) unstable; urgency=medium + + * Try to fix the wasm path detection (Closes: #1052002) + + -- Sylvestre Ledru Thu, 19 Oct 2023 22:37:29 +0200 + +llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Make libclang-common-16-dev arch:any (Closes: #1041455) + It was arch:all because all the code isn't arch dependant + However, it causes issues for cross build. + So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}) + instead of source + + [ Sylvestre Ledru ] + * Bring back old version of spirv - necessary for apt.llvm.org + + [ Alexandre Detiste ] + * Remove python-six as dep + + [ Li Chen ] + * Add support for loongarch64 (Closes: #1053658) + * Cherry-pick upstream patch D142688 to fix the build failure on loong64 + (Closes: #1053655) + + [ Matthias Klose ] + * 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. + + -- Sylvestre Ledru Sun, 08 Oct 2023 09:11:38 +0200 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium diff --cc debian/control index 1d7d625256,7eec2fbefa..01a5d1d0dd --- a/debian/control +++ b/debian/control @@@ -843,9 -843,9 +843,9 @@@ Description: production-quality unwinde or to operate on another process (aka remote), but only the local path has been implemented. Remote unwinding remains as future work. -Package: libunwind-16-dev +Package: libunwind-17-dev Section: libdevel - Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 -Architecture: amd64 arm64 i386 ppc64el ppc64 riscv64 ++Architecture: amd64 arm64 i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${misc:Depends}, diff --cc debian/control.in index ee73ffe839,729e4ba42a..691c944698 --- a/debian/control.in +++ b/debian/control.in @@@ -828,7 -828,7 +828,7 @@@ Description: OpenCL C language implemen Package: libunwind-@LLVM_VERSION@ Section: libs - Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 -Architecture: amd64 arm64 i386 ppc64el ppc64 riscv64 ++Architecture: amd64 arm64 i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} @@@ -845,7 -845,7 +845,13 @@@ Description: production-quality unwinde Package: libunwind-@LLVM_VERSION@-dev Section: libdevel ++<<<<<<< HEAD +Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 ++||||||| merged common ancestors ++Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64 ++======= + Architecture: amd64 arm64 i386 ppc64el ppc64 riscv64 ++>>>>>>> 9373643199d2855668ee3f06acbd4a734f5d5d85 Multi-Arch: same Depends: ${misc:Depends}, diff --cc debian/patches/series index b3b2ddc023,75e163168a..44f992d86d --- a/debian/patches/series +++ b/debian/patches/series @@@ -147,9 -123,11 +123,10 @@@ unwind-force-pthread-dl.dif force-sse2-compiler-rt.diff bolt-disable-emit-relocs.patch link-grpc.diff - -amdgpu/nonlinux.patch -ubuntu-releases.patch -new-cmake-build-fix.patch -HIP-search-path-fix.patch D158066-simd-ppc64el.patch -#mips64el-ompt.patch +ubuntu-releases.patch +libclang-major-version-only.diff +D148945-revert.diff +arm32-defaults.diff +mips/D154390-pre-R6.diff + raspbian-triplet.patch diff --cc debian/rules index 0fd35b24c1,0931fde842..4ebfd36466 --- a/debian/rules +++ b/debian/rules @@@ -188,10 -168,18 +188,17 @@@ endi ifneq (,$(findstring $(DEB_HOST_ARCH),armhf)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabihf - STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON # align arch profile with debian baseline # https://wiki.debian.org/ArmHardFloatPort#Minimum_CPU_.26_FPU - CFLAGS_EXTRA += -march=armv7-a -mfpu=vfpv3-d16 - CXXFLAGS_EXTRA += -march=armv7-a -mfpu=vfpv3-d16 + CFLAGS_EXTRA += -march=armv6 -mfpu=vfpv2 + CXXFLAGS_EXTRA += -march=armv6 -mfpu=vfpv2 + STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF + COMPILER_RT_USE_BUILTINS_LIBRARY := OFF + LIBCXX_USE_COMPILER_RT := OFF + # disable scudo standalone (not supported for baseline armel arch: armv6) + # note: we don't build with "k" in raspbian even though the CPU supports + # it because armv6k atomics have forward-compatibility problems. + STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_SCUDO_STANDALONE=OFF endif ifneq (,$(filter $(DEB_HOST_ARCH),i386)) @@@ -588,9 -547,13 +594,15 @@@ stamps/preconfigure @echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)" @echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)" @echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)" + @echo "LLVM_SPIRV=$(LLVM_SPIRV)" + @echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)" + # add executable flag to script we added as part of triplet hack + # --plugwash + chmod 755 llvm/cmake/config.guess.hack + # also make sure config.guess is executable + chmod 755 llvm/cmake/config.guess + for f in debian/*.in; do \ f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ echo "$$f => $$f2"; \