Merge version 1:3.8.1-18+rpi1 and 1:3.8.1-23 to produce 1:3.8.1-23+rpi1

diff --cc debian/changelog
index 37e086d65c0778f1bd73ffc35d06932486c8f7fa,9052ad69f187f85e028e4385a991cae1acccdf77..84b649965e947cf24d2f38234cc1a8272d7857db
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,64 +1,90 @@@
- llvm-toolchain-3.8 (1:3.8.1-18+rpi1) stretch-staging; urgency=medium
++llvm-toolchain-3.8 (1:3.8.1-23+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Pass armv6-* as triplet rather than arm-* to hopefully stop llvm toolchain 
 +    assuming armv7. (didn't work, it appears that Debian isn't currently using
 +    the autoconf based build).
 +  * 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).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix.cmake
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +  [changes introduced in 1:3.8.1-12+rpi1 by Peter Michael Green]
 +  * Disable testsuite, it seems to be crashing buildboxes.
 +
 +  [changes brought forward from 1:3.8.1-12+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Mon, 03 Oct 2016 22:58:38 +0000]
 +  * Really disable testsuite.
 +
 +  [changes introduced in 1:3.8.1-17+rpi1 by Peter Michael Green]
 +  * Remove more crap in clean target.
 +  * Force creation of debian/man.
 +  * Set config.guess.hack back to mode 644 in clean target to keep dgit happy.
 +
-  -- Peter Micheal Green <plugwash@raspbian.org>  Sat, 25 Mar 2017 22:29:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 04 May 2017 21:43:22 +0000
++
+ llvm-toolchain-3.8 (1:3.8.1-23) unstable; urgency=medium
+ 
+   * Oups, same player try again (wrong package name, sorry)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Apr 2017 19:46:34 +0200
+ 
+ llvm-toolchain-3.8 (1:3.8.1-22) unstable; urgency=medium
+ 
+   * Really fix "use versioned symbols" for llvm
+     Thanks to Julien Cristau for the patch (Closes: #849098)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Apr 2017 15:07:56 +0200
+ 
+ llvm-toolchain-3.8 (1:3.8.1-21) unstable; urgency=medium
+ 
+   * Remove the scan-build-py-3.8 symlink (does not ship in 3.8)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 23 Apr 2017 22:37:21 +0200
+ 
+ llvm-toolchain-3.8 (1:3.8.1-20) unstable; urgency=medium
+ 
+   * Limit the archs where the ocaml binding is built
+     Should fix the FTBFS
+     Currently amd64 arm64 armel armhf i386
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 15 Apr 2017 10:38:51 +0200
+ 
+ llvm-toolchain-3.8 (1:3.8.1-19) unstable; urgency=medium
+ 
+   * Upload in unstable
+   * Bring back ocaml. Thanks to Cyril Soldani (Closes: #858626)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 13 Apr 2017 19:19:09 +0200
+ 
+ llvm-toolchain-3.8 (1:3.8.1-19~exp4) experimental; urgency=medium
+ 
+   * Add override_dh_makeshlibs for the libllvm or liblldb versions
+     Thanks to Julien Cristau for the patch
+   * Fix the symlink on scan-build-py
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 28 Mar 2017 06:32:40 +0200
+ 
+ llvm-toolchain-3.8 (1:3.8.1-19~exp3) experimental; urgency=medium
+ 
+   * change the min version of the libclang1 symbols to 1:3.8.1-19~
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 26 Mar 2017 17:19:38 +0200
+ 
+ llvm-toolchain-3.8 (1:3.8.1-19~exp2) experimental; urgency=medium
+ 
+   * mark the first symbol as (optional) as it differs from ld and gold
+   * remove the empty llvm ocaml package (Closes: #858626)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 25 Mar 2017 16:37:44 +0100
+ 
+ llvm-toolchain-3.8 (1:3.8.1-19~exp1) experimental; urgency=medium
+ 
+   [ Rebecca N. Palmer ]
+   * Use versioned symbols (Closes: #849098)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 19 Mar 2017 22:09:04 +0100
  
  llvm-toolchain-3.8 (1:3.8.1-18) unstable; urgency=medium
  

diff --cc debian/patches/series
index 91d2711d38be67670b1ffc1a752dfd5afbf0fb4b,6b5de5ff4688de1c7caaf799009621b51ef525d4..19a699ca86e8221619ef572f3f4bd8f774b02293
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -56,5 -56,4 +56,6 @@@ lit-force-lang.dif
  clang-arm-default-vfp3-on-armv7a.patch
  lldb-server-path.diff
  lldb-server-link.diff
+ add_symbols_versioning.patch
 +cmake-arm-version-hack.patch
 +remove-more-crap-in-clean-target

diff --cc debian/rules
index 5985e42b235e079cfbe478e8964e63ee9461b668,6964e48776717a567ba8cb72d819001cbde2eaac..582b195ac33e2b9f886460a2f8f85833639e89cc
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -138,17 -134,23 +136,27 @@@ els
        CMAKE_EXTRA += -DLLDB_DISABLE_LIBEDIT=ON
  endif
  
+ DH_OPTIONS=
  
- %:
-       dh $@ --with ocaml
+ OCAML_ENABLE= no
+ OCAML_ARCHS := amd64 arm64 armel armhf i386
+ ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS)))
+ # Enable OCAML for this arch.
+       OCAML_ENABLE=yes
+       OCAML_STDLIB_DIR    ?= $(shell ocamlc -where)
+       DH_OPTIONS=--with ocaml
+ endif
  
  
+ %:
+       dh $@ $(DH_OPTIONS)
+ 
  
  preconfigure:
 +      # add executable flag to script we added as part of triplet hack
 +      # --plugwash
 +      chmod 755 autoconf/config.guess.hack
 +      
        for f in debian/*.in; do \
                f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
                echo "$$f => $$f2"; \
@@@ -286,9 -290,11 +294,12 @@@ override_dh_prep: build_do
  
  
  build_doc:
 +      mkdir -p debian/man
        cd $(CURDIR)/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
        cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
+       if test "$(OCAML_ENABLE)" = yes; then \
+       $(PRE_PROCESS) $(MAKE) $(NJOBS) -C "$(TARGET_BUILD)/docs" ocaml_doc; \
+       fi
  
  # Rename manpages
        d=$(CURDIR)/docs/_build/man/; \