Merge version 1:7.0.1-8+rpi3 and 1:7.0.1-8+deb10u2 to produce 1:7.0.1-8+rpi3+deb10u2

diff --cc debian/changelog
index 8af9aa907787cfb5bb39c9220d3b959400014ab1,0f5f61a1d928b2ee859f4b279c75bc53ed2a03f1..75ee40f507dc34e069def6f09a6ad551be74f2c4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,55 -1,20 +1,67 @@@
- llvm-toolchain-7 (1:7.0.1-8+rpi3) buster-staging; urgency=medium
- 
-   * Apply some upstream patches to remove nonexistent CPU name, hopefully this
-     fixes the thunderbird build failure.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 30 Dec 2019 14:31:05 +0000
- 
- llvm-toolchain-7 (1:7.0.1-8+rpi2) buster-staging; urgency=medium
- 
-   * Make armv6k builds use vfpv2.
-   * Add build-conflicts on libllvm-8-ocaml-dev
-   * Further fixes to clean target.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 09 Jul 2019 19:04:39 +0000
- 
- llvm-toolchain-7 (1:7.0.1-8+rpi1) buster-staging; urgency=medium
++llvm-toolchain-7 (1:7.0.1-8+rpi3+deb10u2) buster-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>  Mon, 11 Mar 2019 22:51:24 +0000
++  [changes brought forward from 1:7.0.1-8+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 09 Jul 2019 19:04:39 +0000]
++  * Make armv6k builds use vfpv2.
++  * Add build-conflicts on libllvm-8-ocaml-dev
++  * Further fixes to clean target.
++
++  [changes brought forward from 1:7.0.1-8+rpi3 by Peter Michael Green <plugwash@raspbian.org> at Mon, 30 Dec 2019 14:31:05 +0000]
++  * Apply some upstream patches to remove nonexistent CPU name, hopefully this
++    fixes the thunderbird build failure.
++
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 27 Sep 2020 23:41:12 +0000
++
+ llvm-toolchain-7 (1:7.0.1-8+deb10u2) buster; urgency=medium
+ 
+   * Non-maintainer upload.
+ 
+   [ Aurelien Jarno ]
+   * Include upstream patch D71028 to add support for min/max/umin/umax
+     atomics, fixing rust mips tests (Closes: #946874).
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 18 Sep 2020 11:47:25 +0200
+ 
+ llvm-toolchain-7 (1:7.0.1-8+deb10u1) buster; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Fix for unordered cmpxchg instructions when building rustc.
+   * Disable nomadd4 instructions on mips*.
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 15 Sep 2020 13:36:29 +0200
  
  llvm-toolchain-7 (1:7.0.1-8) unstable; urgency=medium
  

diff --cc debian/patches/series
index 0373930f94b92fd848ff640c12f96c672204b28b,43b6f2f525d72d75daebb548d5e29dda5db9ee0d..d74419eb0462c825d94b2445828fecef5bc2fd63
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -134,7 -161,6 +134,10 @@@ kfreebsd/lldb_source_Host_freebsd_Host.
  kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
  kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
  kfreebsd/include_llvm_MC_MCELFObjectWriter.h.diff
+ AtomicExpand-Fix-a-crash-bug-when-lowering-unordered-loads.patch
+ mips-force-nomadd4.diff
+ D71028-mips-atomics-rust-test.diff
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094
 +enable-vfpv2-for-armv6k
 +remove-arm1176j-s.patch
 +alter-test-armv6k.patch