Merge version 1:8.0.1-3+rpi1 and 1:8.0.1-4 to produce 1:8.0.1-4+rpi1

diff --cc debian/changelog
index 4e37511020b6bf96a9395ae31195d140c03a56fa,9f79adea622bc1459a90e09ad84f997f0bbb3ecf..030fe9f9734e103cab529f7529aad3638d55d0e3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,17 +1,59 @@@
- llvm-toolchain-8 (1:8.0.1-3+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-8 (1:8.0.1-4+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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-8 1:8.0.1-3+rpi1 by Peter Michael Green]
 +  * Add build-conflicts on python2.7-minimal. If it's installed the build
 +    tries to use it, resulting in a failure.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 03 Nov 2019 04:47:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Nov 2019 22:07:59 +0000
++
+ llvm-toolchain-8 (1:8.0.1-4) unstable; urgency=medium
+ 
+   * Add clangd-X => libclang-common-X-dev dependency
+     See https://bugs.llvm.org/show_bug.cgi?id=43152
+   * python-clang-8: missing dependency on libclang-8-dev
+     (Closes: #941890)
+   * Debian moved to gcc-9. This gcc version now refuses -flto="Thin"
+     Move from LLVM_ENABLE_LTO="Thin" to BOOTSTRAP_LLVM_ENABLE_LTO="Thin"
+     to mitigate the issue (the argument should be passed only at the
+     second stage of the build process)
+     See https://bugs.llvm.org/show_bug.cgi?id=43193
+     (Closes: #943920)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 12 Nov 2019 14:12:48 +0100
  
  llvm-toolchain-8 (1:8.0.1-3) unstable; urgency=medium
  

diff --cc debian/control
index 6ea98e9f371956f03353193ae86e91b291d871d1,7f0c8096eadd7af4bf2731ce0bd7afe01a377640..e75033477a3f6c03f0a8a7af90041890f3fa2d2b
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -18,8 -18,9 +18,9 @@@ Build-Depends: debhelper (>= 9.0), cmak
      ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x],
      libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x],
      dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x],
-     libpfm4-dev
+     libpfm4-dev [linux-any],
+     g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7
 -Build-Conflicts: oprofile, ocaml
 +Build-Conflicts: oprofile, ocaml, python2.7-minimal
  Standards-Version: 4.2.1
  Homepage: https://www.llvm.org/
  Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 8

diff --cc debian/rules
Simple merge