Merge version 1:10.0.0-1+rpi1 and 1:10.0.0-4 to produce 1:10.0.0-4+rpi1

diff --cc debian/changelog
index 97843de80290fb4feed35f9d18203eed7fb3de77,88eebb8bd7e9afb4fa13992ceec32332a25ec1cc..6b214b9ccd8f4c02449ac7862d02e5cde07c7e78
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,40 +1,78 @@@
- llvm-toolchain-10 (1:10.0.0-1+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-10 (1:10.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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Apr 2020 00:28:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Apr 2020 04:13:15 +0000
++
+ llvm-toolchain-10 (1:10.0.0-4) unstable; urgency=medium
+ 
+   * Also ship polly libs in libclang-common-10-dev.
+     Fixes bug #44870 (upstream)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 10 Apr 2020 10:27:41 +0200
+ 
+ llvm-toolchain-10 (1:10.0.0-3) unstable; urgency=medium
+ 
+   * ppc64el/autopkgtest: Just like with arm64, ignore two tests
+   * Update the copyright file with recent changes (Closes: #956287)
+     Thanks to Michael Lustfield for the detective work
+ 
+   [ Jessica Clarke ]
+   * Cherry-pick upstream patch D74453 to fix atomic compare-and-swap on
+     riscv64.
+ 
+   [ William Grant ]
+   * debian/patches/riscv64-multilib-empty.patch: Adjust riscv64 GCC detector
+     to also check for existence of crtbegin.o in the default multilib dir,
+     like most other ports. Fixes FTBFS on riscv64, since on Ubuntu
+     /usr/lib/gcc/riscv64-linux-gnu/10 exists but is empty (gcc-10-base is
+     installed, but libgcc-10-dev is not).
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 02 Apr 2020 21:48:13 +0200
+ 
+ llvm-toolchain-10 (1:10.0.0-2) unstable; urgency=medium
+ 
+   [ Dimitri John Ledkov <xnox@ubuntu.com> ]
+   * s390x: set default abi to z196 for debian, and z13 for ubuntu.
+     LP: #1864226
+ 
+   [ Matthias Klose <doko@ubuntu.com> ]
+   * Apply D76596.diff, proposed backport from the trunk. LP: #1867173.
+     This was causing postgresql to FTBFS with llvm 10
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 27 Mar 2020 05:16:28 +0100
  
  llvm-toolchain-10 (1:10.0.0-1) unstable; urgency=medium
  

diff --cc debian/control
index 452f75a8d3019f49722f0ef5b388120d7ddb0385,b0e4d24aef9a621be22b2e2326d430690704ff15..758b19efe45fef0477a19f530ca89fe471a694c1
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -18,8 -18,8 +18,8 @@@ 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 [linux-any], python3-setuptools, libz3-dev,
+     libpfm4-dev [linux-any], python3-setuptools, libz3-dev
 -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 10

diff --cc debian/patches/series
index 2c5acb46bfd1aca61b90e26c23d4c44a919b5126,2eed081bd110d61bec0c11ac59a2736fabcdbabc..92778938d74e26b0c8984bd36895e812b5aaac14
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -82,7 -98,8 +82,6 @@@ remove-apple-clang-manpage.dif
  # Hurd port
  hurd/hurd-cxx-paths.diff
  hurd/hurd-pathmax.diff
--
  # powerpcspe
  #powerpcspe/D49754-powerpcspe-clang.diff
  #powerpcspe/D54583-powerpcspe-double-parameter.diff
@@@ -102,22 -120,29 +101,23 @@@
  # 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
  clang-riscv64-multiarch.diff
- 
+ D74453-riscv-atomic_cmp_xchg.diff
 -
  # Compiler-rt - workaround
  workaround-bug-42994-use-linker.diff
--
  # bug 939472
  #try-to-unbreak-thinlto.diff
  D67877.patch
  disable-fuzzer-compiler-rt-x86.diff
  no-z3.patch
--
  python3-shebang.patch
  print-lldb-path.patch
  no-cgi.patch
  d21664cce1db8debe2528f36b1fbd2b8af9c9401.patch
 -
+ 0001-systemz-allow-configuring-default-SYSTEMZ_DEFAULT_AR.patch
 -
+ D76596.diff
+ riscv64-multilib-empty.patch
 +raspbian-triplet.patch

diff --cc debian/rules
Simple merge