diff -Nru llvm-toolchain-3.7-3.7.1/debian/changelog llvm-toolchain-3.7-3.7.1/debian/changelog
--- llvm-toolchain-3.7-3.7.1/debian/changelog	2015-12-11 14:24:02.000000000 +0100
+++ llvm-toolchain-3.7-3.7.1/debian/changelog	2015-12-21 02:37:40.000000000 +0100
@@ -1,3 +1,10 @@
+llvm-toolchain-3.7 (1:3.7.1-1ubuntu2) xenial; urgency=medium
+
+  * Disable LLDB on i386, the testsuite is failing.
+    (LP: #1527865)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 20 Dec 2015 09:35:09 +0100
+
 llvm-toolchain-3.7 (1:3.7.1-1ubuntu1) xenial; urgency=low
 
   * Merge from Debian unstable (LP: #1525122).  Remaining changes:
diff -Nru llvm-toolchain-3.7-3.7.1/debian/control llvm-toolchain-3.7-3.7.1/debian/control
--- llvm-toolchain-3.7-3.7.1/debian/control	2015-12-11 14:24:02.000000000 +0100
+++ llvm-toolchain-3.7-3.7.1/debian/control	2015-12-20 19:53:24.000000000 +0100
@@ -395,7 +395,7 @@
 # ------------- lldb -------------
 
 Package: lldb-3.7
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32  mips mipsel
+Architecture: amd64 armel armhf kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32  mips mipsel
 # ia64 mips mipsel hurd ppc64el s390x powerpc alpha have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version}), python, llvm-3.7-dev, python-lldb-3.7
 Conflicts: lldb-3.4, lldb-3.5
@@ -406,7 +406,7 @@
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-3.7
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+Architecture: amd64 armel armhf kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
 # ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -421,7 +421,7 @@
  This package contains the LLDB runtime library.
 
 Package: liblldb-3.7-dbg
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+Architecture: amd64 armel armhf kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
 # ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.7 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -451,7 +451,7 @@
 
 Package: liblldb-3.7-dev
 Section: libdevel
-Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+Architecture: amd64 armel armhf kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
 # ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.7 (= ${binary:Version})
 Replaces: lldb-3.7-dev (<= 1:3.7~svn215195-2)
diff -Nru llvm-toolchain-3.7-3.7.1/debian/rules llvm-toolchain-3.7-3.7.1/debian/rules
--- llvm-toolchain-3.7-3.7.1/debian/rules	2015-11-18 14:26:21.000000000 +0100
+++ llvm-toolchain-3.7-3.7.1/debian/rules	2015-12-20 19:53:47.000000000 +0100
@@ -115,7 +115,7 @@
 
 
 LLDB_ENABLE=yes
-LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el s390x powerpc alpha
+LLDB_DISABLE_ARCHS := arm64 i386 hurd-i386 ia64 ppc64el s390x powerpc alpha
 # hurd has threading issues
 # And some archs are failing because of https://llvm.org/bugs/show_bug.cgi?id=24548
 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))