Merge raspbian changes from llvm-toolchain-3.9 packaging.

diff --cc cmake/modules/GetHostTriple.cmake
Simple merge

diff --cc compiler-rt/cmake/base-config-ix.cmake
index 71d14992ee77806c0a1baecd05af989233b5620e,9f79a8ee58b746acf07589f866f969d43860e976..8d1f2693f200b1bc93efc37e0aedcb907aa428d8
--- 1/compiler-rt/cmake/base-config-ix.cmake
--- 2/compiler-rt/cmake/base-config-ix.cmake
+++ b/compiler-rt/cmake/base-config-ix.cmake
@@@ -167,12 -153,8 +167,12 @@@ macro(test_targets
        test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu")
        test_target_arch(mips64 "" "-mips64r2" "--target=mips64-linux-gnu" "-mabi=64")
      elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm")
 -      test_target_arch(arm "" "" "-mfloat-abi=soft")
 -      test_target_arch(armhf "" "" "-mfloat-abi=hard")
 +      if(WIN32)
 +        test_target_arch(arm "" "" "")
 +      else()
-         test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
-         test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
++        test_target_arch(arm "" "" "-mfloat-abi=soft")
++        test_target_arch(armhf "" "" "-mfloat-abi=hard")
 +      endif()
      elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")
        test_target_arch(aarch32 "" "-march=armv8-a")
      elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64")

diff --cc debian/changelog
index 0c5501e1967f67526c857ed8b8d609d9d31de37a,29d278e387d82c7c6f4de9bed849830233f3f26d..01fb8fc0eace8d881ebe7216c39dacbde4955d2d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,51 -1,52 +1,72 @@@
 -llvm-toolchain-3.9 (1:3.9.1-10+rpi1) buster-staging; urgency=medium
++llvm-toolchain-4.0 (1:4.0.1-1+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
+ 
 - -- Raspbian forward porter <root@raspbian.org>  Wed, 28 Jun 2017 23:45:48 +0000
++ -- Peter Micahel Green <plugwash@raspbian.org>  Thu, 06 Jul 2017 20:48:08 +0000
+ 
 -llvm-toolchain-3.9 (1:3.9.1-10) unstable; urgency=medium
 +llvm-toolchain-4.0 (1:4.0.1-1) unstable; urgency=medium
  
 -  * Now that strech has been released, upload in unstable!
 -    This is necessary for rust in unstable
 -  * Try to fix some PATH_MAX on hurd
 -  * Enable the verbose mode when trying to build libfuzzer
 -    to detect potential issues in the path search
 +  * New stable release
 +  * Add libomp-dev to the suggests of clang
 +  * Add the ld.lld manpage
 +  * Add Provides on python-lldb-x.y & python-clang-x.y & libllvm-x.y-ocaml-dev
 +    to avoid the recurring problem about conflicts
 +    (Closes: #835546, #863739, #863742)
 +  * Standards-Version => 4.0.0
 +  * Generate the llvm-tblgen, clang-change-namespace, clang-offload-bundler
 +    lld, clang++, clang-check, clang-cpp & clang-import-test manpages
 +  * Remove the --no-discard-stderr option from help2man calls
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 14 Jun 2017 19:06:20 +0200
 +
 +llvm-toolchain-4.0 (1:4.0.1~+rc3-1) unstable; urgency=medium
 +
 +  [ Sylvestre Ledru ]
 +  * Try to fix polly on hurd (missing PATH_MAX)
 +  * New snapshot release
  
 - -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 18 Jun 2017 19:12:15 +0200
 +  [ Gianfranco Costamagna ]
 +  * Fix clang-doc generation
 +    - there was a missing install file
  
 -llvm-toolchain-3.9 (1:3.9.1-10~exp1) experimental; urgency=medium
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 14 Jun 2017 09:59:59 +0200
  
 -  [ Ximin Luo ]
 -  * Fix a rustc armhf SIGILL by backporting upstream D31265.
 +llvm-toolchain-4.0 (1:4.0.1~+rc2-1) unstable; urgency=medium
  
 - -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 12 Jun 2017 17:38:06 +0200
 +  * New snapshot release
 +  * Remove clang-tblgen from clang-X.Y (done by upstream)
  
 -llvm-toolchain-3.9 (1:3.9.1-9) unstable; urgency=medium
 + -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 01 Jun 2017 23:01:38 +0200
  
 -  * debian/patches/fix-R_AARCH64_MOVW_UABS_G3-relocation.patch:
 -    fix relocation issue, preventing Julia from working correctly on
 -    arm64 (Closes: #862535)
 -  * Fix doc generation (Closes: #862597)
 -    - there was a missing install file
 +llvm-toolchain-4.0 (1:4.0.1~+rc1-2) unstable; urgency=medium
  
 - -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 02 Jun 2017 15:14:18 +0200
 +  * Only enable libfuzzer for Linux kernel.
 +    Thanks to Pino Toscano for the patch
  
 -llvm-toolchain-3.9 (1:3.9.1-8) unstable; urgency=medium
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 06 May 2017 10:03:14 +0200
 +
 +llvm-toolchain-4.0 (1:4.0.1~+rc1-1) unstable; urgency=medium
 +
 +  * New snapshot release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 05 May 2017 09:44:42 +0200
 +
 +llvm-toolchain-4.0 (1:4.0-5) unstable; urgency=medium
  
    * Really fix "use versioned symbols" for llvm
      Thanks to Julien Cristau for the patch (Closes: #849098)

diff --cc debian/patches/series
index 0af13e9ed39829b0832f34050596cfd3fcbe4482,a74766e3a25e9be91b91eccef116c396989586e7..18a3abef5cf47eb3f9d007a8bc2c19c4d34956bc
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -29,20 -29,26 +29,21 @@@ clang-analyzer-force-version.dif
  install-scan-build-py.diff
  scan-view-fix-path.diff
  mips-fpxx-enable.diff
 -disable-test-failing-sparc-i386.diff
  fix-cmake-config-prefix.diff
  lldb-link-atomic-cmake.patch
 +disable-source-interleave.diff
 +silent-gold-utils.diff
  disable-llvm-symbolizer-test.diff
 -kfreebsd-support.diff
 +#fix-lldb-server-build
  clang-tidy-run-bin.diff
 -drop-wrong-hack-arm64.patch
 +#bug-30342.diff
  fix-scan-view-path.diff
 +#0011-SimplifyCFG-Hoisting-invalidates-metadata.patch
  clang-fix-cmpxchg8-detection-on-i386.patch
 -upstream-msan-prevent-initialization-failure.diff
 -upstream-asan-msan-fix-reallocation-logic.diff
 -lit-force-lang.diff
 -clang-arm-default-vfp3-on-armv7a.patch
  lldb-addversion-suffix-to-llvm-server-exec.patch
 -lldb-server-link.diff
 -amdgpu-regression.diff
 -esan-Fix-ESan-test-failure-on-Debian-Sid-bot.diff
 -esan-Fix-ESan-test-failure-on-Debian-Sid-bot2.diff
 -857623-allow-opencl-pointer-to-bool.diff
 +lldb-missing-install.diff
 +silent-test-failing-codeverage.diff
 +silent-amdgpu-test-failing.diff
 +pthread-link.diff
  add_symbols_versioning.patch
 -fix-R_AARCH64_MOVW_UABS_G3-relocation.patch
 -rust-0032-Fix-computeKnownBits-for-ARMISD-CMOV.patch
+ cmake-arm-version-hack.patch

diff --cc debian/rules
index 8f944cf6093a173bd4549d80b9a5d504e41b8b3c,53a5fc316d0111a0b883e6123d7c599900d994bf..0b91b753fe6f02d0c8ccfdd0fc5b8a26d2351a72
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -500,7 -476,8 +506,7 @@@ override_dh_installdeb
  # Remove auto generated python pyc
        find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f
  
- ifeq (${RUN_TEST},yes)
 -
+ ifeq (false,true)
  # List of the archs we know we have 100 % tests working
  ARCH_LLVM_TEST_OK := i386 amd64