Merge version 1:9.0.1-12+rpi1 and 1:9.0.1-13 to produce 1:9.0.1-13+rpi1

diff --cc debian/changelog
index db4810c2621c0d1dcfdba06701215cefe21b2bee,0308a413b25c7d85dab117860eeb793f042d3686..a3adc7dc69a3f5ae6e640f611b1285cba57963e9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,14 +1,52 @@@
- llvm-toolchain-9 (1:9.0.1-12+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-9 (1:9.0.1-13+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>  Sun, 19 Apr 2020 00:18:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 17 Jul 2020 10:46:04 +0000
++
+ llvm-toolchain-9 (1:9.0.1-13) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * Add mips-force-nomadd4.diff to default to +nomadd4 on MIPS.
+ 
+   [ Ximin Luo ]
+   * Add 373184.patch to fix soundness issue affecting rustc. (Closes: #959877)
+   * Add f8e146f3430de3a6cd904f3f3f7aa1bfaefee14c.patch to fix big-endian
+     miscompilation affecting rustc.
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 07 Jul 2020 18:18:00 +0200
  
  llvm-toolchain-9 (1:9.0.1-12) unstable; urgency=medium
  

diff --cc debian/patches/series
index 5a5f910c8b6bba8f53b9d143bc602beb2b971d9b,e98390e61cd873f6be239d5ca0e76eb3c7c422ff..108b2cb95eb2afbfa351c8d52a2f1ad58d8f32b1
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -67,8 -80,10 +67,9 @@@ libcxx/libcxx-test-atomics-set-compare-
  libcxx/libcxx-silent-test-libcxx.diff
  libcxx/libcxx-silent-failure-ppc64el.diff
  libcxx/libcxx-silent-failure-arm64.diff
 -
  # Change default optims
  mips-fpxx-enable.diff
+ mips-force-nomadd4.diff
  26-set-correct-float-abi.diff
  clang-baseline-fix-i386.patch
  disable-sse2-old-x86.diff
@@@ -122,4 -146,8 +123,7 @@@ print-lldb-path.patc
  no-cgi.patch
  947f9692440836dcb8d88b74b69dd379d85974ce.patch
  riscv64-multilib-empty.patch
 -
+ # bug 959877
+ 373184.patch
 -
+ f8e146f3430de3a6cd904f3f3f7aa1bfaefee14c.patch
 +raspbian-triplet.patch