Merge version 1:10.0.1-1+rpi1 and 1:10.0.1-5 to produce 1:10.0.1-5+rpi1

diff --cc debian/changelog
index bf2f7eed6a9f959cca6eb9249747f9a922c1d57d,eab252107b35afeea4deacb4777a7a2d4d202489..81517b5319c0317466e676774968135e5ff063b3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,44 +1,82 @@@
- llvm-toolchain-10 (1:10.0.1-1+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-10 (1:10.0.1-5+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, 30 Jul 2020 15:46:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 07 Sep 2020 19:26:01 +0000
++
+ llvm-toolchain-10 (1:10.0.1-5) unstable; urgency=medium
+ 
+   [ John Paul Adrian Glaubitz ]
+   * Use dh-exec to exclude lib/libPolly*.a on powerpc and
+     powerpcspe from libclang-common-X.Y-dev.install.in
+ 
+   [ Gianfranco Costamagna ]
+   * autopkgtests: ignore binfmts enable command return value.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 31 Aug 2020 12:28:24 +0200
+ 
+ llvm-toolchain-10 (1:10.0.1-4) unstable; urgency=medium
+ 
+   * Fix testsuite by ignoring binfmts test
+     (can't be enabled on autopkgtests)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 28 Aug 2020 21:54:05 +0200
+ 
+ llvm-toolchain-10 (1:10.0.1-3) unstable; urgency=medium
+ 
+   * Fix testsuite by enabling binfmts support before using it
+     (the default is disabled)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 27 Aug 2020 12:42:20 +0200
+ 
+ llvm-toolchain-10 (1:10.0.1-2) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * patches/hurd/hurd-cxx-paths.diff: Refresh, some of the factorization was
+     backported from 11 to 10.
+ 
+   [ Gianfranco Costamagna ]
+   * debian/patches/mips-force-nomadd4.patch: Apply and rebase patch to disable
+     nomadd4 on mips* (Closes: #964989)
+     - thanks Yunqiang Su <wzssyqa@gmail.com> for the patch
+ 
+   [ Steve Langasek ]
+   * Drop ocaml support on i386, which pulls in a series of packages which
+     is not reasonable to support.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 23 Aug 2020 22:57:55 +0200
  
  llvm-toolchain-10 (1:10.0.1-1) unstable; urgency=medium
  

diff --cc debian/control
index 66316fe9713a96c4c8a51b0ce4cc145608a10f60,b6fdc9eecd3e66be4a53e91abdd6d28fdd265205..bbd16d0d54ddce52d0ddd40b9cb7bd0d0947caf3
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -14,12 -14,12 +14,12 @@@ Build-Depends: debhelper (>= 9.0), cmak
      g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
      libjs-mathjax, python3-recommonmark,
      doxygen, gfortran,
-     ocaml-nox [amd64 arm64 armhf i386 ppc64el s390x],
-     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],
+     ocaml-nox [amd64 arm64 armhf ppc64el 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
 +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 b490e6b0fc008ab743befed5f952ae968776d2b1,48789a1d5f1859ad6a8e023fa3223acd9d644b60..0dc7c2bb1d67427902b26ea6a0c16908ae84f6ef
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -120,4 -145,5 +120,5 @@@ no-cgi.patc
  ubuntu-groovy.diff
  clang_vendor_pass_stage2.diff
  remove-trailing-space-version.diff
+ mips-force-nomadd4.patch
 +raspbian-triplet.patch

diff --cc debian/rules
Simple merge