Merge version 1:6.0.1-2+rpi1 and 1:6.0.1-3 to produce 1:6.0.1-3+rpi1

diff --cc debian/changelog
index f9d81c9871c09ce6c0d8582bf475b16cfcb3f471,77070a2d1c7da9c0ac5d57fed369537e8d1db5c0..35a93ea448a353646778722f965fe828da702187
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,20 +1,52 @@@
- llvm-toolchain-6.0 (1:6.0.1-2+rpi1) buster-staging; urgency=medium
++llvm-toolchain-6.0 (1:6.0.1-3+rpi1) 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.
 +  * 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>  Sun, 08 Jul 2018 15:21:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 15 Aug 2018 01:57:15 +0000
++
+ llvm-toolchain-6.0 (1:6.0.1-3) unstable; urgency=medium
+ 
+   * Backport to fix a miscompilation issue with rust.
+     See https://github.com/rust-lang/rust/issues/52694
+     and https://github.com/rust-lang/llvm/pull/106
+ 
+   [ Dimitri John Ledkov ]
+   * Enable lldb on ppc64el LP: #1777136
+ 
+   [ Lumin ]
+   * backport two upstream patches to fix julia miscompiling (Closes: #905397)
+     llvm-D49832-SCEVPred.patch, llvm-rL323946-LSRTy.patch
+ 
+   [ Gianfranco Costamagna ]
+   * Team Upload to unstable
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 09 Aug 2018 10:06:11 +0200
  
  llvm-toolchain-6.0 (1:6.0.1-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index dc880db74d5346eb2bfe79ac4b0846cba13a2095,dbdfda6df6a11b18ba76b9965fa67331bda1cec9..37c2950deccd1554994c19a56f0e7d277e280428
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -54,4 -54,7 +54,8 @@@ remove-test-freezing.dif
  0048-Set-html_static_path-_static-everywhere.patch
  0049-Use-Debian-provided-MathJax-everywhere.patch
  ubuntu-cosmic-support.patch
+ D40146-JumpThreading-backport-1.diff
+ D42717-JumpThreading-backport-2.diff
+ llvm-D49832-SCEVPred.patch
+ llvm-rL323946-LSRTy.patch
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094

diff --cc debian/rules
Simple merge