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

diff --cc debian/changelog
index aed84d5d8a3b7e3ebe5b0093b2c4973bb95cb0e1,1c4ff733595102541efd68ba02cf40cc52757173..edbba79affc0ba7198c4f3ddfead268ef9ce2f23
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,32 +1,70 @@@
- llvm-toolchain-7 (1:7.0.1-1+rpi2) buster-staging; urgency=medium
++llvm-toolchain-7 (1:7.0.1-4+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.
 +
 +  [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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 24 Dec 2018 21:11:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Jan 2019 12:59:24 +0000
++
+ llvm-toolchain-7 (1:7.0.1-4) unstable; urgency=medium
+ 
+   * Remove dbgsym packages from debci because of bug #917528
+ 
+   [ Gianfranco Costamagna ]
+   * Ignore a test result on i386, due to upstream bug 26580#c18
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 02 Jan 2019 12:37:45 +0100
+ 
+ llvm-toolchain-7 (1:7.0.1-3) unstable; urgency=medium
+ 
+   * Also install clang-7-dbgsym libclang1-7-dbgsym in autopkgtest
+     to verify that debug symbols are present
+   * Cherry-pick upstream fix D52340 to address a rustc debuginfo
+     (Closes: #917209)
+   * Change the jit debug path from $HOME/.debug/jit/ to
+     $TMPDIR/.debug/jit/ (Closes: #916393)
+   * Document in README.source some Debian/Ubuntu specific changes
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 26 Dec 2018 22:57:45 +0100
+ 
+ llvm-toolchain-7 (1:7.0.1-2) unstable; urgency=medium
+ 
+   * Enable -DENABLE_LINKER_BUILD_ID:BOOL=ON as, unlike gcc, isn't enabled
+     by default in clang. Thanks to Adrian Bunk for the patch.
+     Once more, thanks to Rebecca Palmer (Closes: #916975)
+   * Build with -g1 also on 64bit architectures (thanks to Adrian too)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 21 Dec 2018 17:07:44 +0100
  
  llvm-toolchain-7 (1:7.0.1-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index e48e360c6f6188d6cc11873821df753ecad595dc,f189a67612b81a2e43a2ee64ebaa1ad879028052..b961c4c0ebf60313c0904434cdd24b81e0f6dfff
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -18,10 -20,14 +18,11 @@@ x32-fix-driver-search-paths.dif
  symbolizer-path.diff
  clang-tidy-run-bin.diff
  0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
 -
+ debug-jit-path.diff
  # commented because of bug 903709
  #force-gcc-header-obj.diff
 -
  do-not-fail-on-unexpected-pass.diff
  disable-display-PASS-UNSUPPORTED-XFAIL.diff
 -
  # llvm-config
  fix-llvm-config-obj-src-root.patch
  fix-llvm-config.diff
@@@ -79,7 -95,8 +80,7 @@@ mips-fpxx-enable.dif
  clang-baseline-fix-i386.patch
  disable-sse2-old-x86.diff
  clang-arm-default-vfp3-on-armv7a.patch
- # For the boostrap
 -
+ # For the bootstrap
  bootstrap-fix-include-next.diff
  clangd-atomic-cmake.patch
  pr39427-misscompile.diff
@@@ -110,4 -133,5 +111,5 @@@ powerpcspe-add-missing-include-path.dif
  D49754-powerpcspe-clang.diff
  D54409-powerpcspe-register-spilling.diff
  D54584-powerpcspe-double-parameter.diff
 -
+ D52340-rustc-debuginfo.diff
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094

diff --cc debian/rules
Simple merge