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

diff --cc debian/changelog
index db325f06488992becbb91d40fdba42ed00832cb4,16cef65578726ee4123063bc0e6e98400c9c6c92..66eb5c6f135e74e739ac0d26ca40a3d98dba1f5b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,19 +1,57 @@@
- llvm-toolchain-9 (1:9.0.0-3+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-9 (1:9.0.0-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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 26 Nov 2019 11:23:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 30 Nov 2019 14:45:35 +0000
++
+ llvm-toolchain-9 (1:9.0.0-4) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * hurd-cxx-paths.diff: Re-introduce patch to find C++ headers.
+   * hurd-EIEIO-undef.diff: Drop patch, already fixed a different way upstream.
+   * hurd-pathmax.diff: Drop now-useless parts.
+ 
+   [ Sylvestre Ledru ]
+   * Add libz3-dev as dependencies on llvm-X.Y-dev (Closes: #943996)
+   * Update build-dep libpfm4-dev to linux-any.
+     Thanks to Samuel Thibault for the patch
+ 
+   [ Gianfranco Costamagna ]
+   * Add also Ubuntu focal to the gcc-8 arch list
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 05 Nov 2019 10:30:26 +0100
  
  llvm-toolchain-9 (1:9.0.0-3) unstable; urgency=medium
  

diff --cc debian/control
index 69501ac7449324ab7042c5f88511532b379e9a22,9333d91794dbde06a9bac2ea1eb716c48132d2e0..b1446e56df2fbc53c8ffdc52078906a192ad9780
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -18,9 -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, python3-setuptools, libz3-dev,
+     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
      g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7
 -Build-Conflicts: oprofile, ocaml
 +Build-Conflicts: oprofile, ocaml, 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 9

diff --cc debian/patches/series
index 947565ef4a07ab6e44557025c8d31d7428a5d7fb,142890900a3174ebdd12b8817c7045113bb3cb0c..595059d92f430c375e2f23b22d72b9e4a525c1ad
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -79,10 -95,12 +79,10 @@@ 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
- hurd/hurd-EIEIO-undef.diff
  hurd/impl-path-hurd.diff
 -
+ hurd/hurd-cxx-paths.diff
  # powerpcspe
  #powerpcspe/D49754-powerpcspe-clang.diff
  #powerpcspe/D54583-powerpcspe-double-parameter.diff

diff --cc debian/rules
Simple merge