diff --git a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
index fd6e67b9..772cbec5 100644
--- a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
+++ b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.5~svn197241/lldb/test/dotest.py
+Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/test/dotest.py
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197241.orig/lldb/test/dotest.py	2013-12-12 02:42:17.000000000 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197241/lldb/test/dotest.py	2013-12-13 17:41:36.892654261 +0100
-@@ -1609,8 +1609,8 @@
+--- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/test/dotest.py	2014-01-30 21:19:22.000000000 +0100
++++ llvm-toolchain-snapshot_3.5~svn201241/lldb/test/dotest.py	2014-02-12 17:04:14.971889980 +0100
+@@ -1612,8 +1612,8 @@
              def addSuccess(self, test):
                  global parsable
                  super(LLDBTestResult, self).addSuccess(test)
@@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_3.5~svn197241/lldb/test/dotest.py
  
              def addError(self, test, err):
                  global sdir_has_content
-@@ -1650,8 +1650,8 @@
+@@ -1653,8 +1653,8 @@
                  method = getattr(test, "markExpectedFailure", None)
                  if method:
                      method(err, bugnumber)
@@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_3.5~svn197241/lldb/test/dotest.py
  
              def addSkip(self, test, reason):
                  global sdir_has_content
-@@ -1661,8 +1661,8 @@
+@@ -1664,8 +1664,8 @@
                  method = getattr(test, "markSkippedTest", None)
                  if method:
                      method()
@@ -35,10 +35,10 @@ Index: llvm-toolchain-snapshot_3.5~svn197241/lldb/test/dotest.py
  
              def addUnexpectedSuccess(self, test, bugnumber):
                  global sdir_has_content
-Index: llvm-toolchain-snapshot_3.5~svn197241/lldb/test/unittest2/runner.py
+Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/test/unittest2/runner.py
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197241.orig/lldb/test/unittest2/runner.py	2013-12-13 17:40:36.080652315 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197241/lldb/test/unittest2/runner.py	2013-12-13 17:40:36.076652315 +0100
+--- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/test/unittest2/runner.py	2013-09-25 22:47:51.000000000 +0200
++++ llvm-toolchain-snapshot_3.5~svn201241/lldb/test/unittest2/runner.py	2014-02-12 17:04:14.971889980 +0100
 @@ -171,9 +171,9 @@
          if hasattr(result, 'separator2'):
              self.stream.writeln(result.separator2)
diff --git a/debian/patches/lldb-link-atomic.diff b/debian/patches/lldb-link-atomic.diff
index aae852f5..ffd417f6 100644
--- a/debian/patches/lldb-link-atomic.diff
+++ b/debian/patches/lldb-link-atomic.diff
@@ -1,21 +1,15 @@
-Description: Link lldb with -latomic to get GCC atomic helpers
-Author: Adam Conrad <adconrad@ubuntu.com>
-Forwarded: no
-Last-Update: 2013-08-21
-
-Index: llvm-toolchain-snapshot_3.5~svn200375/lldb/lib/Makefile
+Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/lib/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn200375.orig/lldb/lib/Makefile	2014-01-29 07:49:00.508714445 -0800
-+++ llvm-toolchain-snapshot_3.5~svn200375/lldb/lib/Makefile	2014-01-29 07:49:46.396713007 -0800
-@@ -150,6 +150,10 @@
-     LLVMLibsOptions += -Wl,--no-undefined
+--- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/lib/Makefile	2014-02-12 17:04:14.743875515 +0100
++++ llvm-toolchain-snapshot_3.5~svn201241/lldb/lib/Makefile	2014-02-12 17:06:32.408601271 +0100
+@@ -151,6 +151,10 @@
      # Link in python
      LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel
-+    ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel))
-+    ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe))
-+    # Link GCC atomic helper library
-+    LLVMLibsOptions += -latomic
-+    endif
      LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
++    ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe))
++     # Link GCC atomic helper library
++     LLVMLibsOptions += -latomic
++    endif
  endif
  
+ ifeq ($(HOST_OS),FreeBSD)