Merge raspbian changes from llvm-toolchain-4.0

diff --cc compiler-rt/cmake/base-config-ix.cmake
index b38c6ca96facaa7ea7dc25eff72218b82ec1832b,8d1f2693f200b1bc93efc37e0aedcb907aa428d8..a35f1bf2555d0148edd148087e5dbeb9a1d73204
--- 1/compiler-rt/cmake/base-config-ix.cmake
--- 2/compiler-rt/cmake/base-config-ix.cmake
+++ b/compiler-rt/cmake/base-config-ix.cmake
@@@ -172,9 -170,8 +172,9 @@@ macro(test_targets
        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")
 +        test_target_arch(armv6m "" "-march=armv6m" "-mfloat-abi=soft")
        endif()
      elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")
        test_target_arch(aarch32 "" "-march=armv8-a")

diff --cc debian/changelog
index 8523c96cd7a7dcf4c2e2c35a4c9e808c202b8485,01fb8fc0eace8d881ebe7216c39dacbde4955d2d..60bfd610ef7505338cf4ca93fe779a6216e0441a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,81 -1,83 +1,102 @@@
 -llvm-toolchain-4.0 (1:4.0.1-1+rpi1) buster-staging; urgency=medium
++llvm-toolchain-5.0 (1:5.0~+rc2-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
+ 
 - -- Peter Micahel Green <plugwash@raspbian.org>  Thu, 06 Jul 2017 20:48:08 +0000
++ -- Peter Micahel Green <plugwash@raspbian.org>  Thu, 07 Sep 2017 06:08:08 +0000
+ 
 -llvm-toolchain-4.0 (1:4.0.1-1) unstable; urgency=medium
 +llvm-toolchain-5.0 (1:5.0~+rc2-1) unstable; urgency=medium
  
 -  * 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
 +  * Force the usage of gcc 6 until the link issues with gcc 7 are fixed
 +    https://bugs.llvm.org/show_bug.cgi?id=34140
 +  * Remove the temp-unbreak-5.0-build.diff patch to unbreak the build
  
 -  [ Gianfranco Costamagna ]
 -  * Fix clang-doc generation
 -    - there was a missing install file
 +  [ Katsuhiko Nishimra ]
 +  * Ensure /usr/bin/g++-$(GCC_VERSION) exists (Closes: #871591)
  
 - -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 14 Jun 2017 09:59:59 +0200
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 12 Aug 2017 11:38:36 +0200
  
 -llvm-toolchain-4.0 (1:4.0.1~+rc2-1) unstable; urgency=medium
 +llvm-toolchain-5.0 (1:5.0~+rc1-2) unstable; urgency=medium
  
 -  * New snapshot release
 -  * Remove clang-tblgen from clang-X.Y (done by upstream)
 +  * Update the list of symbol for libclang1. Added:
 +    - clang_Cursor_isExternalSymbol
 +    - clang_EnumDecl_isScoped
 +    - clang_getAddressSpace
 +    - clang_getCursorExceptionSpecificationType
 +    - clang_getExceptionSpecificationType
 +    - clang_getTypedefName
 +    - clang_suspendTranslationUnit
  
 - -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 01 Jun 2017 23:01:38 +0200
 + -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 28 Jul 2017 10:24:44 +0200
  
 -llvm-toolchain-4.0 (1:4.0.1~+rc1-2) unstable; urgency=medium
 +llvm-toolchain-5.0 (1:5.0~+rc1-1) unstable; urgency=medium
  
 -  * Only enable libfuzzer for Linux kernel.
 -    Thanks to Pino Toscano for the patch
 -
 - -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 06 May 2017 10:03:14 +0200
 +  * New testing release
 +  * Upload as a new package
 +  * Ship the opt-viewer new program as part of llvm-5.0 tools
 +  * ld.lld manpage wasn't installed
 +  * Comment a line to unbreak the build (temp-unbreak-5.0-build.diff)
 +    To be removed
  
 -llvm-toolchain-4.0 (1:4.0.1~+rc1-1) unstable; urgency=medium
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 09 Jul 2017 17:36:10 +0200
  
 -  * New snapshot release
 +llvm-toolchain-snapshot (1:5.0~svn305653-1) unstable; urgency=medium
  
 - -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 05 May 2017 09:44:42 +0200
 +  [ Gianfranco Costamagna ]
 +  * Re-add clang-doc documentation
  
 -llvm-toolchain-4.0 (1:4.0-5) unstable; urgency=medium
 +  [ Sylvestre Ledru ]
 +  * New snapshot release
 +  * Fix a hurd PATH_MAX issue
 +  * Transform the lldb swig check from a error to a warning
 +  * Add libomp-dev to the suggests of clang
 +  * 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
 +  * use -DPOLLY_BUNDLED_JSONCPP=OFF & add pkg-config as a dep (to help find
 +    the files)
  
 -  * Really fix "use versioned symbols" for llvm
 -    Thanks to Julien Cristau for the patch (Closes: #849098)
 -  * Prepare version 4.0.1
 -  * Tolerate if ocaml failed
 -  * Just like with snapshot, add libncurses in the list of build deps
 -    (Closes: #861170)
 + -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 09 Jun 2017 12:04:56 +0200
  
 - -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Apr 2017 13:32:25 +0200
 +llvm-toolchain-snapshot (1:5.0~svn302368-1~exp1) experimental; urgency=medium
  
 -llvm-toolchain-4.0 (1:4.0-4) unstable; urgency=medium
 +  * Only enable libfuzzer for Linux kernel.
 +    Thanks to Pino Toscano for the patch
 +  * Add option -DPOLLY_BUNDLED_JSONCPP=ON
 +    to use the system lib instead of the patch d/p/use-deb-json.diff
 +  * New symbols added in libclang
 +     - clang_EvalResult_getAsLongLong
 +     - clang_EvalResult_getAsUnsigned
 +     - clang_EvalResult_isUnsignedInt
 +     - clang_TargetInfo_dispose
 +     - clang_TargetInfo_getPointerWidth
 +     - clang_TargetInfo_getTriple
 +     - clang_Type_isTransparentTagTypedef
 +     - clang_getAllSkippedRanges
 +     - clang_getTranslationUnitTargetInfo
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 07 May 2017 12:13:43 +0200
 +
 +llvm-toolchain-snapshot (1:5.0~svn298899-1) unstable; urgency=medium
  
    * Limit the archs where the ocaml binding is built
      Should fix the FTBFS

diff --cc debian/patches/series
index 58de66c8db0a357452edcd6ade879b0bf527f911,18a3abef5cf47eb3f9d007a8bc2c19c4d34956bc..b044259fc796ec1c5fb680375f8df628fac4608b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -42,7 -43,7 +42,9 @@@ clang-fix-cmpxchg8-detection-on-i386.pa
  lldb-addversion-suffix-to-llvm-server-exec.patch
  lldb-missing-install.diff
  silent-test-failing-codeverage.diff
 -silent-amdgpu-test-failing.diff
 -pthread-link.diff
 -add_symbols_versioning.patch
 +disable-path-test-failing.diff
 +silent-amd-tet.diff
 +disable-error-xray.diff
 +lldb-disable-swig-error.diff
+ cmake-arm-version-hack.patch
++

diff --cc debian/rules
Simple merge