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

diff --cc debian/changelog
index c1586846267bdd0f882468c03db5903237eb28af,423af7d1e8e083709fb3c57e7d25a4d18376a20e..db4810c2621c0d1dcfdba06701215cefe21b2bee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,17 +1,55 @@@
- llvm-toolchain-9 (1:9.0.1-11+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-9 (1:9.0.1-12+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, 09 Apr 2020 12:41:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 19 Apr 2020 00:18:48 +0000
++
+ llvm-toolchain-9 (1:9.0.1-12) unstable; urgency=medium
+ 
+   [ 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).
+ 
+  -- Jessica Clarke <jrtc27@debian.org>  Wed, 01 Apr 2020 16:23:55 +0100
  
  llvm-toolchain-9 (1:9.0.1-11) unstable; urgency=medium
  

diff --cc debian/patches/series
index bdc21e1137b4dc7a187ebc96c6a39528696e8f5e,f2ff18c58ba1115024e3c418035542302c598688..5a5f910c8b6bba8f53b9d143bc602beb2b971d9b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -109,6 -130,8 +109,7 @@@ clang-riscv64-multiarch.dif
  clang-riscv64-rv64gc.diff
  llvm-riscv64-fix-cffi.diff
  D60657-riscv-pcrel_lo.diff
 -
+ D74453-riscv-atomic_cmp_xchg.diff
  #try-to-unbreak-thinlto.diff
  D67877.patch
  disable-lit-cpuid-install.diff
@@@ -120,4 -144,4 +121,5 @@@ python3-shebang.patc
  print-lldb-path.patch
  no-cgi.patch
  947f9692440836dcb8d88b74b69dd379d85974ce.patch
+ riscv64-multilib-empty.patch
 +raspbian-triplet.patch