From: Peter Michael Green Date: Sun, 6 Feb 2022 19:26:25 +0000 (+0000) Subject: Manual merge of version 1:12.0.1-17+rpi1 and 1:12.0.1-19 to produce 1:12.0.1-19+rpi1 X-Git-Tag: archive/raspbian/1%12.0.1-19+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=389c1c0849442854dccdc1140e4ddc752be80c44;p=llvm-toolchain-12.git Manual merge of version 1:12.0.1-17+rpi1 and 1:12.0.1-19 to produce 1:12.0.1-19+rpi1 --- 389c1c0849442854dccdc1140e4ddc752be80c44 diff --cc debian/changelog index f8d11c0e60,03c3c6dbd8..500378e659 --- a/debian/changelog +++ b/debian/changelog @@@ -1,43 -1,20 +1,61 @@@ - llvm-toolchain-12 (1:12.0.1-17+rpi1) bookworm-staging; urgency=medium ++llvm-toolchain-12 (1:12.0.1-19+rpi1) bookworm-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. + - -- Raspbian forward porter Sun, 12 Dec 2021 16:04:28 +0000 ++ -- Peter Michael Green Sun, 06 Feb 2022 19:25:05 +0000 ++ + llvm-toolchain-12 (1:12.0.1-19) UNRELEASED; urgency=medium + + * Build clangd with GRPC support + Thanks to Sam McCall for the patch + + -- Sylvestre Ledru Sat, 29 Jan 2022 10:17:38 +0100 + + llvm-toolchain-12 (1:12.0.1-18) unstable; urgency=medium + + * Unbreak llvm-toolchain-12 on buster. + -fuse-ld=gold wasn't passed to compiler-rt. it was using bfd. + And binutils shipping in buster has a bug preventing this to work: + https://github.com/llvm/llvm-project/issues/42339 + * Rename ocaml-nox => ocaml-base (Closes: #1002608) + * Remove Build-Conflicts: ocaml + + -- Sylvestre Ledru Thu, 16 Dec 2021 17:49:22 +0100 llvm-toolchain-12 (1:12.0.1-17) unstable; urgency=medium diff --cc debian/control index c0d8ea4fa1,a538a82d9c..2b99212434 --- a/debian/control +++ b/debian/control @@@ -17,12 -17,16 +17,14 @@@ Build-Depends: debhelper (>= 9.0), cmak g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python3-recommonmark, doxygen, gfortran, - ocaml-nox [amd64 arm64 armhf ppc64el s390x], + 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 - Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev + libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] | hello [!i386], - spirv-tools [ linux-any ] | hello [ !i386], + libgrpc++-dev, libprotobuf-dev, protobuf-compiler, protobuf-compiler-grpc + # "| 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 snapshot diff --cc debian/patches/series index d1705df91b,0586e16213..8631f7dcaa --- a/debian/patches/series +++ b/debian/patches/series @@@ -57,7 -68,8 +57,6 @@@ disable-error-xray.dif # OpenMP openmp/openmp-check-execstack.diff openmp/openmp-mips-affinity.patch -- # libcxx libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch libcxx/libcxx-test-fix-lockfree-test-for-i386.patch @@@ -69,7 -82,7 +68,6 @@@ libcxx/libcxx-silent-failure-arm64.dif mips/mips-fpxx-enable.diff mips/mips-force-nomadd4.patch mips/mips-D101773-reloc.patch -- 26-set-correct-float-abi.diff clang-baseline-fix-i386.patch disable-sse2-old-x86.diff @@@ -80,9 -95,10 +78,8 @@@ clangd-atomic-cmake.patc # https://reviews.llvm.org/D60380 remove-apple-clang-manpage.diff 0049-Use-Debian-provided-MathJax-everywhere.patch - # Hurd port hurd/hurd-pathmax.diff -- # kfreebsd # kfreebsd/clang_lib_Basic_Targets.diff # kfreebsd/CMakeLists.txt.diff @@@ -98,21 -114,23 +95,17 @@@ # kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff # kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff # kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff - 930008-arm.diff bootstrap-fix-include-next.diff - # riscv64 risc/clang-riscv64-multiarch.diff -- # sparc64 sparc/sparc-D98574-clang-def.patch sparc/sparc-D98575-compiler-rt.patch -- # bug 939472 #try-to-unbreak-thinlto.diff #D67877-cmake-clang-example.patch -- x86-fuzzer.patch -- python3-shebang.patch print-lldb-path.patch libcxx-armhf-ftbfs.diff @@@ -120,7 -138,7 +113,6 @@@ D99501-ignore-lto-auto.diff scan-build-py-fix-analyze-path.diff scan-build-py-fix-default-bin.diff -- libclc-llvm-spirv.diff omp-riscv64.patch llvm-fix-lld-linker-check.diff @@@ -131,4 -149,5 +123,5 @@@ libcxx-libatomic-only-with-gcc-rtlib.di libcxxabi-fix-link-builtins.diff llvm-runtimes-builtins-build-check.diff compilerrt-builtins-arch-fix-armhf.diff + use-gold-for-compiler-rt-when-set.diff - +raspbian-triplet.patch diff --cc debian/rules index 8555c3f0be,980d0cadcd..beddc5a182 --- a/debian/rules +++ b/debian/rules @@@ -92,7 -92,12 +92,12 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),spar STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif + ifneq (,$(filter $(DISTRO),stretch)) + # Help to find the fakeroot path + export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):/usr/lib/x86_64-linux-gnu/libfakeroot/ + endif + -ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel mipsel powerpc powerpcspe riscv64)) +ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel armhf 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 @@@ -395,13 -409,9 +412,15 @@@ preconfigure @echo "LLVM_VERSION=$(LLVM_VERSION)" @echo "LLVM_VERSION_FULL=$(LLVM_VERSION_FULL)" @echo "LLVM_VERSION_SNAPSHOT=$(LLVM_VERSION_SNAPSHOT)" + @echo "PATH=$(PATH)" + @echo "LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" + # 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"; \