From: Peter Michael Green Date: Thu, 17 Nov 2022 08:44:03 +0000 (+0000) Subject: Manual merge of version 1:13.0.1-6~deb11u1+rpi1 and 1:13.0.1-6~deb10u4 to produce... X-Git-Tag: archive/raspbian/1%13.0.1-6_deb10u4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5bdfde6d6808bed4396414f7000db3d958040453;p=llvm-toolchain-13.git Manual merge of version 1:13.0.1-6~deb11u1+rpi1 and 1:13.0.1-6~deb10u4 to produce 1:13.0.1-6~deb10u4+rpi1 --- 5bdfde6d6808bed4396414f7000db3d958040453 diff --cc debian/changelog index 50203acaf2,71703e7a3a..4a9a9a6a79 --- a/debian/changelog +++ b/debian/changelog @@@ -1,49 -1,30 +1,77 @@@ - llvm-toolchain-13 (1:13.0.1-6~deb11u1+rpi1) bullseye-staging; urgency=medium ++llvm-toolchain-13 (1:13.0.1-6~deb10u4+rpi1) buster-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. + - -- Raspbian forward porter Wed, 05 Oct 2022 00:24:20 +0000 ++ -- Peter Michael Green Thu, 17 Nov 2022 08:43:01 +0000 ++ + llvm-toolchain-13 (1:13.0.1-6~deb10u4) buster; urgency=medium + + * Disable libunwind on mips. + + -- Emilio Pozuelo Monfort Thu, 21 Jul 2022 09:14:44 +0200 + + llvm-toolchain-13 (1:13.0.1-6~deb10u3) buster; urgency=medium + + * Disable lldb on mips. + + -- Emilio Pozuelo Monfort Tue, 19 Jul 2022 11:37:05 +0200 + + llvm-toolchain-13 (1:13.0.1-6~deb10u2) buster; urgency=medium + + * Don't build-dep on llvm-spirv, it's not available in buster + and having an alternative doesn't work on the buildds. + * Add support for mips in various places. + + -- Emilio Pozuelo Monfort Fri, 15 Jul 2022 11:10:37 +0200 + + llvm-toolchain-13 (1:13.0.1-6~deb10u1) buster; urgency=medium + + * Non-maintainer upload. + * Backport to buster. + * Don't install libclang grpc proto libs, they are not built in buster. + + -- Emilio Pozuelo Monfort Wed, 06 Jul 2022 16:28:45 +0200 llvm-toolchain-13 (1:13.0.1-6~deb11u1) bullseye; urgency=medium diff --cc debian/control index 4351e38542,db883b95c5..3528dcb773 --- a/debian/control +++ b/debian/control @@@ -18,16 -18,18 +18,17 @@@ Build-Depends: debhelper (>= 10.0), cma libjs-mathjax, python3-recommonmark, doxygen, gfortran, 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-findlib [amd64 arm64 armhf ppc64el s390x], + libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x], + dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-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] + # llvm-spirv [ amd64 arm64 armel armhf mips mips64el mipsel ppc64el s390x ] | hello [!i386], - spirv-tools [ linux-any ] | hello [ !i386], + libgrpc++-dev [amd64 arm64 armel armhf mips mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], + protobuf-compiler-grpc [amd64 arm64 armel armhf mips mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], + libprotobuf-dev [amd64 arm64 armel armhf mips mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], + protobuf-compiler [amd64 arm64 armel armhf mips mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] # "| hello" is for older buster/bionic distros without spirv support -Build-Conflicts: oprofile +Build-Conflicts: oprofile, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 13 diff --cc debian/rules index 1e33ac3604,bc612b6475..c020516f69 --- a/debian/rules +++ b/debian/rules @@@ -96,7 -96,7 +96,7 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),spar STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif - ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel armhf mipsel powerpc powerpcspe riscv64)) -ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel mips mipsel powerpc powerpcspe riscv64)) ++ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel armhf mips mipsel powerpc powerpcspe riscv64)) # For some reason, in the stage2 build, when clang is used to compile # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion # everywhere and in all stages @@@ -262,7 -255,7 +262,7 @@@ endi # Enable libunwind (or not) LIBUNWIND_ENABLE=yes - ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel armhf m68k mipsel hurd-i386 powerpc sparc sparc64 x32)) -ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mips mipsel hurd-i386 powerpc sparc sparc64 x32)) ++ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel armhf m68k mips mipsel hurd-i386 powerpc sparc sparc64 x32)) LIBUNWIND_ENABLE=no # do not use compiler-rt builtins for libcxx (libcxxabi) when libunwind is # disabled since the gnu implementation in libgcc_s will then be required