Merge version 1:7.0.1-8+rpi2 and 1:7.0.1-9 to produce 1:7.0.1-9+rpi1

diff --cc debian/changelog
index 736f38706784d6e444fb54164624bbe549d11362,47e1e7d96465c1a48002fc7bd2e447230f9b824f..3894faa6ac8769d5a3e12e1f3eeb74ae09641b8e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,13 +1,56 @@@
- 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-9+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>  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.
++
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 18 Aug 2019 19:55:23 +0000
++
+ llvm-toolchain-7 (1:7.0.1-9) unstable; urgency=medium
+ 
+   * Add ubuntu disco and eoan to supported ubuntu releases
+   * Fixed wrong shlib generation of libomp5 library
+ 
+   [ Andreas Beckmann ]
+   * For now, lld doesn't generate shared libs. Removing the files
+     (Closes: #857653, LP: #1829677)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 21 Apr 2019 22:55:47 +0200
  
  llvm-toolchain-7 (1:7.0.1-8) unstable; urgency=medium
  

diff --cc debian/patches/series
index 91f72dc396262e60228c7a78c222615fa6b17523,b32f96a909081d50ea35c5a1e5469703519ed6f5..ae3e90fb54af656fbc2fd688464abfcc2f9cba92
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -134,5 -161,4 +134,6 @@@ 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
+ ubuntu-eoan-distro.patch
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094
 +enable-vfpv2-for-armv6k

diff --cc debian/rules
Simple merge