Merge version 1:6.0.1-12+rpi1 and 1:6.0.1-14 to produce 1:6.0.1-14+rpi1

diff --cc debian/changelog
index 6240a161bfc0931104b07803939027854e5c0347,37cd7d8b5105a4566f5799514c054cb8593eb442..fc178dae958e1a6176b9042f060813ea7e17d902
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,15 +1,47 @@@
- llvm-toolchain-6.0 (1:6.0.1-12+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-6.0 (1:6.0.1-14+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.
 +  * Put commented out (by Debian not us)  ocaml build-depends into build-conflicts
 +    if they are installed it seems that the package builds the ocaml stuff and
 +    then errors out during packaging because it's not installed to anywhere.
 +
 +  [changes introduced in 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 31 Jan 2020 19:51:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 03 Apr 2020 22:09:49 +0000
++
+ llvm-toolchain-6.0 (1:6.0.1-14) unstable; urgency=medium
+ 
+   * debian/patches/947f9692440836dcb8d88b74b69dd379d85974ce.patch:
+     - usptream fix for new glibc 2.31
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 23 Mar 2020 11:59:23 +0100
+ 
+ llvm-toolchain-6.0 (1:6.0.1-13) unstable; urgency=medium
+ 
+   * Drop -doc packages, in order to reduce rdeps of python-sphinx
+ 
+  -- Sandro Tosi <morph@debian.org>  Sun, 22 Mar 2020 19:32:55 -0400
  
  llvm-toolchain-6.0 (1:6.0.1-12) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index da6271a0cdfec3e3e1f5a531b1fe3b2df6b156ea,9977d35d204f3275c616a052fbb2485800460480..9e5e66fdbc249c43d191aa06e8d7d399abadd460
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -94,4 -94,4 +94,5 @@@ julia/llvm-6.0-NVPTX-addrspaces.patc
  # (12) [bug fix] llvm-D49832-SCEVPred
  #     [bug fix] llvm-rL323946-LSRTy
  # Already applied before
+ 947f9692440836dcb8d88b74b69dd379d85974ce.patch
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094

diff --cc debian/rules
Simple merge