diff -Nru llvm-toolchain-3.8-3.8.1/debian/changelog llvm-toolchain-3.8-3.8.1/debian/changelog
--- llvm-toolchain-3.8-3.8.1/debian/changelog 2016-06-29 15:50:01.000000000 +0200
+++ llvm-toolchain-3.8-3.8.1/debian/changelog 2016-07-01 14:12:33.000000000 +0200
@@ -1,3 +1,27 @@
+llvm-toolchain-3.8 (1:3.8.1-2ubuntu1) yakkety; urgency=medium
+
+ * Merge with Debian (LP: #1593952); remaining changes:
+ - Disable lldb on s390x.
+ - Remove the build tree before calling dh_strip; at least the amd64 buildd
+ runs out of diskspace at this step.
+ - rules: Allow LLVM tests to fail on i386, we know dropping AVX512 breaks
+ them.
+ - drop-avx512-from-skylake.diff: Don't enable AVX512 on Skylake, as it's
+ a server cpu feature and breaks llvmpipe on workstations.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 01 Jul 2016 14:11:46 +0200
+
+llvm-toolchain-3.8 (1:3.8.1-2) unstable; urgency=medium
+
+ [ Sylvestre Ledru ]
+ * Add a symlink from usr/lib/llvm-3.8/share/llvm/cmake
+ pointing to usr/share/llvm-3.8/cmake
+
+ [ Gianfranco Costamagna ]
+ * Remove python-lldb-3.8 where liblldb-3.8-dev is not built
+
+ -- Sylvestre Ledru <sylvestre@debian.org> Tue, 28 Jun 2016 14:44:48 +0200
+
llvm-toolchain-3.8 (1:3.8.1-1ubuntu1) yakkety; urgency=low
* Merge with Debian (LP: #1593952); remaining changes:
diff -Nru llvm-toolchain-3.8-3.8.1/debian/control llvm-toolchain-3.8-3.8.1/debian/control
--- llvm-toolchain-3.8-3.8.1/debian/control 2016-06-29 15:50:01.000000000 +0200
+++ llvm-toolchain-3.8-3.8.1/debian/control 2016-07-01 14:11:40.000000000 +0200
@@ -397,7 +397,7 @@
Package: python-lldb-3.8
Section: python
-Architecture: any
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.8-dev, python, python-six
Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.7
Pre-Depends: ${misc:Pre-Depends}
diff -Nru llvm-toolchain-3.8-3.8.1/debian/llvm-X.Y-dev.links.in llvm-toolchain-3.8-3.8.1/debian/llvm-X.Y-dev.links.in
--- llvm-toolchain-3.8-3.8.1/debian/llvm-X.Y-dev.links.in 2016-05-10 03:01:56.000000000 +0200
+++ llvm-toolchain-3.8-3.8.1/debian/llvm-X.Y-dev.links.in 2016-07-01 14:11:00.000000000 +0200
@@ -3,10 +3,14 @@
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1
+
usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/include/llvm-c
usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/include/llvm
usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/build/include/llvm-c
usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/build/include/llvm
+
usr/lib/llvm-@LLVM_VERSION@/include/ usr/lib/llvm-@LLVM_VERSION@/build/include
usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Release
usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Debug+Asserts
+
+usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake usr/share/llvm-@LLVM_VERSION@/cmake
diff -Nru llvm-toolchain-3.8-3.8.1/debian/rules llvm-toolchain-3.8-3.8.1/debian/rules
--- llvm-toolchain-3.8-3.8.1/debian/rules 2016-06-29 15:50:01.000000000 +0200
+++ llvm-toolchain-3.8-3.8.1/debian/rules 2016-07-01 14:11:40.000000000 +0200
@@ -240,7 +240,7 @@
-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION) \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DCMAKE_CXX_FLAGS=$(CXXFLAGS_EXTRA) \
+ -DCMAKE_CXX_FLAGS="$(CXXFLAGS_EXTRA)" \
-DLLVM_LINK_LLVM_DYLIB=ON \
-DLLVM_VERSION_SUFFIX= \
-DLLVM_ENABLE_SPHINX=ON \