diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch
index 54820291..cd188b78 100644
--- a/debian/patches/0003-Debian-version-info-and-bugreport.patch
+++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Support/CommandLine.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/lib/Support/CommandLine.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn188990.orig/lib/Support/CommandLine.cpp	2013-08-22 09:07:22.728608907 +0200
-+++ llvm-toolchain-snapshot_3.4~svn188990/lib/Support/CommandLine.cpp	2013-08-22 09:07:22.724608907 +0200
-@@ -1686,6 +1686,10 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/lib/Support/CommandLine.cpp	2014-01-14 11:30:41.540868855 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/lib/Support/CommandLine.cpp	2014-01-14 11:30:41.536868855 +0100
+@@ -1692,6 +1692,10 @@
      OS << LLVM_VERSION_INFO;
  #endif
      OS << "\n  ";
diff --git a/debian/patches/0021-shared-lib-debian.patch b/debian/patches/0021-shared-lib-debian.patch
index 93471c6c..5e6f1b9f 100644
--- a/debian/patches/0021-shared-lib-debian.patch
+++ b/debian/patches/0021-shared-lib-debian.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn193982/tools/llvm-shlib/Makefile
+Index: llvm-toolchain-snapshot_3.5~svn199197/tools/llvm-shlib/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn193982.orig/tools/llvm-shlib/Makefile	2013-11-04 09:09:01.840586768 +0100
-+++ llvm-toolchain-snapshot_3.4~svn193982/tools/llvm-shlib/Makefile	2013-11-04 09:09:01.836586768 +0100
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/tools/llvm-shlib/Makefile	2014-01-14 11:30:43.656868813 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/tools/llvm-shlib/Makefile	2014-01-14 11:30:43.652868813 +0100
 @@ -39,6 +39,12 @@
  LLVMLibsPaths   := $(IncludeInLibLlvm)
  
@@ -15,7 +15,7 @@ Index: llvm-toolchain-snapshot_3.4~svn193982/tools/llvm-shlib/Makefile
  
  ifeq ($(HOST_OS),Darwin)
      # set dylib internal version number to llvmCore submission number
-@@ -70,7 +76,7 @@
+@@ -67,7 +73,7 @@
  
  ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU))
      # Add soname to the library.
diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch
index 66b5b138..826f658b 100644
--- a/debian/patches/0023-link-libopagent.patch
+++ b/debian/patches/0023-link-libopagent.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn193603/configure
+Index: llvm-toolchain-snapshot_3.5~svn199197/configure
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn193603.orig/configure	2013-10-29 12:26:09.742137116 +0100
-+++ llvm-toolchain-snapshot_3.4~svn193603/configure	2013-10-29 12:26:09.738137117 +0100
-@@ -13315,7 +13315,7 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/configure	2014-01-14 11:30:45.488868777 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/configure	2014-01-14 11:30:45.484868777 +0100
+@@ -13335,7 +13335,7 @@
        case $llvm_cv_os_type in
          Linux)
            if test -n "$llvm_cv_oppath" ; then
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_3.4~svn193603/configure
                                                              { echo "$as_me:$LINENO: checking for library containing bfd_init" >&5
  echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; }
  if test "${ac_cv_search_bfd_init+set}" = set; then
-@@ -13411,7 +13411,7 @@
+@@ -13431,7 +13431,7 @@
  echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; }
  ac_res=$ac_cv_search_bfd_init
  if test "$ac_res" != no; then
@@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_3.4~svn193603/configure
  
  fi
  
-@@ -13447,8 +13447,8 @@
+@@ -13467,8 +13467,8 @@
    if test -z "$ac_lib"; then
      ac_res="none required"
    else
diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff
index 7fd876b5..9d0c3835 100644
--- a/debian/patches/0044-soname.diff
+++ b/debian/patches/0044-soname.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn193982/tools/llvm-shlib/Makefile
+Index: llvm-toolchain-snapshot_3.5~svn199197/tools/llvm-shlib/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn193982.orig/tools/llvm-shlib/Makefile	2013-11-04 09:46:03.312667676 +0100
-+++ llvm-toolchain-snapshot_3.4~svn193982/tools/llvm-shlib/Makefile	2013-11-04 09:46:03.308667675 +0100
-@@ -76,7 +76,7 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/tools/llvm-shlib/Makefile	2014-01-14 11:30:47.656868734 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/tools/llvm-shlib/Makefile	2014-01-14 11:30:47.652868734 +0100
+@@ -73,7 +73,7 @@
  
  ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU))
      # Add soname to the library.
diff --git a/debian/patches/18-soname.patch b/debian/patches/18-soname.patch
index 12446c70..66ce5dca 100644
--- a/debian/patches/18-soname.patch
+++ b/debian/patches/18-soname.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn193628/clang/tools/libclang/Makefile
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/libclang/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn193628.orig/clang/tools/libclang/Makefile	2013-10-29 18:21:54.358914501 +0100
-+++ llvm-toolchain-snapshot_3.4~svn193628/clang/tools/libclang/Makefile	2013-10-29 18:22:13.622915201 +0100
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/tools/libclang/Makefile	2014-01-14 11:31:50.080867509 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/tools/libclang/Makefile	2014-01-14 11:31:50.076867509 +0100
 @@ -14,6 +14,7 @@
  
  LINK_LIBS_IN_SHARED = 1
@@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_3.4~svn193628/clang/tools/libclang/Makefile
  
  include $(CLANG_LEVEL)/../../Makefile.config
  LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
-@@ -30,7 +31,7 @@
+@@ -31,7 +32,7 @@
  
  # Add soname to the library.
  ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD))
diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch
index 8c13131b..401953e1 100644
--- a/debian/patches/19-clang_debian_version.patch
+++ b/debian/patches/19-clang_debian_version.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Basic/Version.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Version.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn188146.orig/clang/lib/Basic/Version.cpp	2013-08-11 10:01:27.104734895 +0200
-+++ llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Basic/Version.cpp	2013-08-11 10:01:27.104734895 +0200
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Basic/Version.cpp	2014-01-14 11:27:21.140872790 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Version.cpp	2014-01-14 11:30:26.020869154 +0100
 @@ -15,6 +15,7 @@
  #include "clang/Basic/LLVM.h"
  #include "llvm/Config/config.h"
@@ -10,13 +10,12 @@ Index: llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Basic/Version.cpp
  #include <cstdlib>
  #include <cstring>
  
-@@ -121,7 +122,8 @@
+@@ -125,7 +126,7 @@
  #ifdef CLANG_VENDOR
    OS << CLANG_VENDOR;
  #endif
--  OS << "clang version " CLANG_VERSION_STRING " "
-+  OS << "clang version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION " "
-+
+-  OS << ToolName << " version " CLANG_VERSION_STRING " "
++  OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION " "
       << getClangFullRepositoryVersion();
  
    // If vendor supplied, include the base LLVM version as well.
diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
index 5eddd3c2..3d532da9 100644
--- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff
+++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-3.4-3.4~+rc1/clang/include/clang/Basic/Builtins.def
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/include/clang/Basic/Builtins.def
 ===================================================================
---- llvm-toolchain-3.4-3.4~+rc1.orig/clang/include/clang/Basic/Builtins.def	2013-11-24 16:14:43.676235943 +0100
-+++ llvm-toolchain-3.4-3.4~+rc1/clang/include/clang/Basic/Builtins.def	2013-11-24 16:14:43.668235942 +0100
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/include/clang/Basic/Builtins.def	2014-01-14 11:30:31.712869048 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/include/clang/Basic/Builtins.def	2014-01-14 11:30:31.700869048 +0100
 @@ -471,8 +471,8 @@
  BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
  BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
@@ -24,11 +24,11 @@ Index: llvm-toolchain-3.4-3.4~+rc1/clang/include/clang/Basic/Builtins.def
  //   id objc_msgSend(id, SEL, ...)
  LIBBUILTIN(objc_msgSend, "GGH.",   "f",     "objc/message.h", OBJC_LANG)
  // long double objc_msgSend_fpret(id self, SEL op, ...) 
-Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Sema/SemaChecking.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Sema/SemaChecking.cpp
 ===================================================================
---- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/Sema/SemaChecking.cpp	2013-11-24 16:14:43.676235943 +0100
-+++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/Sema/SemaChecking.cpp	2013-11-24 16:14:43.668235942 +0100
-@@ -813,9 +813,10 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Sema/SemaChecking.cpp	2014-01-14 11:30:31.712869048 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Sema/SemaChecking.cpp	2014-01-14 11:30:31.704869048 +0100
+@@ -817,9 +817,10 @@
      return false;
  
    // Handle memory setting and copying functions.
@@ -42,11 +42,11 @@ Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Sema/SemaChecking.cpp
      CheckStrncatArguments(TheCall, FnInfo);
    else
      CheckMemaccessArguments(TheCall, CMId, FnInfo);
-Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/AST/Decl.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/AST/Decl.cpp
 ===================================================================
---- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/AST/Decl.cpp	2013-11-24 16:14:43.676235943 +0100
-+++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/AST/Decl.cpp	2013-11-24 16:14:43.672235943 +0100
-@@ -3018,10 +3018,10 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/AST/Decl.cpp	2014-01-14 11:30:31.712869048 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/AST/Decl.cpp	2014-01-14 11:30:31.704869048 +0100
+@@ -3027,10 +3027,10 @@
    case Builtin::BImemmove:
      return Builtin::BImemmove;
  
@@ -61,10 +61,10 @@ Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/AST/Decl.cpp
  
    case Builtin::BI__builtin_memcmp:
    case Builtin::BImemcmp:
-Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 ===================================================================
---- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-11-24 16:14:43.676235943 +0100
-+++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-11-24 16:14:43.672235943 +0100
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2014-01-14 11:30:31.712869048 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2014-01-14 11:30:31.704869048 +0100
 @@ -238,9 +238,9 @@
      case Builtin::BIstrncpy:
      case Builtin::BIstrncat:
@@ -78,9 +78,9 @@ Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/StaticAnalyzer/Checkers/GenericTain
      case Builtin::BIstrndup:
        return TaintPropagationRule(0, 1, ReturnValueIndex);
  
-Index: llvm-toolchain-3.4-3.4~+rc1/clang/test/Sema/builtins.c
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/Sema/builtins.c
 ===================================================================
---- llvm-toolchain-3.4-3.4~+rc1.orig/clang/test/Sema/builtins.c	2013-11-24 16:14:43.676235943 +0100
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/test/Sema/builtins.c	2014-01-14 11:30:31.712869048 +0100
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,199 +0,0 @@
 -// RUN: %clang_cc1 %s -fsyntax-only -verify -pedantic -Wno-string-plus-int -triple=i686-apple-darwin9
@@ -282,9 +282,9 @@ Index: llvm-toolchain-3.4-3.4~+rc1/clang/test/Sema/builtins.c
 -  __noop(1); // expected-warning {{implicit declaration}}
 -  __debugbreak(); // expected-warning {{implicit declaration}}
 -}
-Index: llvm-toolchain-3.4-3.4~+rc1/clang/test/Sema/warn-strlcpycat-size.c
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/Sema/warn-strlcpycat-size.c
 ===================================================================
---- llvm-toolchain-3.4-3.4~+rc1.orig/clang/test/Sema/warn-strlcpycat-size.c	2013-11-24 16:14:43.676235943 +0100
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/test/Sema/warn-strlcpycat-size.c	2014-01-14 11:30:31.712869048 +0100
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,55 +0,0 @@
 -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff
index 726aec2a..71906ac6 100644
--- a/debian/patches/26-set-correct-float-abi.diff
+++ b/debian/patches/26-set-correct-float-abi.diff
@@ -18,11 +18,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
-Index: llvm-toolchain-snapshot_3.5~svn197487/clang/lib/Driver/Tools.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/Tools.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197487.orig/clang/lib/Driver/Tools.cpp	2013-12-17 12:03:19.775063993 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197487/clang/lib/Driver/Tools.cpp	2013-12-17 12:03:19.771063993 +0100
-@@ -650,7 +650,7 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/Tools.cpp	2014-01-14 11:31:55.328867405 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/Tools.cpp	2014-01-14 11:31:55.324867405 +0100
+@@ -653,7 +653,7 @@
          FloatABI = "hard";
          break;
        case llvm::Triple::GNUEABI:
diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff
index 4bbe62ce..47551b71 100644
--- a/debian/patches/atomic_library_1.diff
+++ b/debian/patches/atomic_library_1.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.5~svn197690/clang/lib/Basic/Targets.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197690.orig/clang/lib/Basic/Targets.cpp	2013-12-19 17:15:54.092573180 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197690/clang/lib/Basic/Targets.cpp	2013-12-19 17:15:54.088573180 +0100
-@@ -3757,6 +3757,20 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Basic/Targets.cpp	2014-01-14 11:31:14.036868217 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp	2014-01-14 11:31:14.032868217 +0100
+@@ -3747,6 +3747,20 @@
      // FIXME: Override "preferred align" for double and long long.
    }
  
@@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_3.5~svn197690/clang/lib/Basic/Targets.cpp
  public:
    ARMTargetInfo(const llvm::Triple &Triple)
        : TargetInfo(Triple), CPU("arm1136j-s"), FPMath(FP_Default),
-Index: llvm-toolchain-snapshot_3.5~svn197690/clang/test/CodeGen/linux-arm-atomic.c
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/CodeGen/linux-arm-atomic.c
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197690.orig/clang/test/CodeGen/linux-arm-atomic.c	2013-12-19 17:15:54.092573180 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197690/clang/test/CodeGen/linux-arm-atomic.c	2013-12-19 17:15:54.088573180 +0100
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/test/CodeGen/linux-arm-atomic.c	2014-01-14 11:31:14.036868217 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/test/CodeGen/linux-arm-atomic.c	2014-01-14 11:31:14.032868217 +0100
 @@ -1,5 +1,15 @@
  // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
  // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s
diff --git a/debian/patches/atomic_library_2.diff b/debian/patches/atomic_library_2.diff
index d7881de2..cfaba121 100644
--- a/debian/patches/atomic_library_2.diff
+++ b/debian/patches/atomic_library_2.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn193982/clang/test/CodeGen/linux-arm-atomic.c
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/CodeGen/linux-arm-atomic.c
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/test/CodeGen/linux-arm-atomic.c	2013-11-04 09:46:48.988669339 +0100
-+++ llvm-toolchain-snapshot_3.4~svn193982/clang/test/CodeGen/linux-arm-atomic.c	2013-11-04 09:46:48.988669339 +0100
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/test/CodeGen/linux-arm-atomic.c	2014-01-14 11:31:16.356868171 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/test/CodeGen/linux-arm-atomic.c	2014-01-14 11:31:16.352868171 +0100
 @@ -1,5 +1,6 @@
  // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
  // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s
@@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_3.4~svn193982/clang/test/CodeGen/linux-arm-atomic
  
  typedef int _Atomic_word;
  _Atomic_word exchange_and_add(volatile _Atomic_word *__mem, int __val) {
-Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Basic/Targets.cpp	2013-11-04 09:46:48.988669339 +0100
-+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp	2013-11-04 09:46:48.988669339 +0100
-@@ -3688,9 +3688,23 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Basic/Targets.cpp	2014-01-14 11:31:16.356868171 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp	2014-01-14 11:31:16.352868171 +0100
+@@ -3756,9 +3756,23 @@
      if (T.getOS() != llvm::Triple::Linux)
       return false;
      StringRef ArchName = T.getArchName();
diff --git a/debian/patches/debian-mips64-n32-multiarch.diff b/debian/patches/debian-mips64-n32-multiarch.diff
index 62a6b0e9..e0be4352 100644
--- a/debian/patches/debian-mips64-n32-multiarch.diff
+++ b/debian/patches/debian-mips64-n32-multiarch.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197156.orig/clang/lib/Driver/ToolChains.cpp	2013-12-12 16:38:08.665767586 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp	2013-12-12 16:38:08.661767586 +0100
-@@ -1183,10 +1183,12 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:30.336867896 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:30.336867896 +0100
+@@ -1184,10 +1184,12 @@
  
    static const char *const MIPS64LibDirs[] = { "/lib64", "/lib" };
    static const char *const MIPS64Triples[] = { "mips64-linux-gnu",
@@ -17,7 +17,7 @@ Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
  
    static const char *const PPCLibDirs[] = { "/lib32", "/lib" };
    static const char *const PPCTriples[] = {
-@@ -1346,9 +1348,9 @@
+@@ -1374,9 +1376,9 @@
  }
  
  static bool isMipsArch(llvm::Triple::ArchType Arch) {
@@ -30,7 +30,7 @@ Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
           Arch == llvm::Triple::mips64el;
  }
  
-@@ -2344,6 +2346,14 @@
+@@ -2388,6 +2390,14 @@
      if (llvm::sys::fs::exists(SysRoot + "/lib/mipsel-linux-gnu"))
        return "mipsel-linux-gnu";
      return TargetTriple.str();
@@ -45,7 +45,7 @@ Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
    case llvm::Triple::ppc:
      if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc-linux-gnuspe"))
        return "powerpc-linux-gnuspe";
-@@ -2696,6 +2706,12 @@
+@@ -2727,6 +2737,12 @@
    const StringRef MIPSELMultiarchIncludeDirs[] = {
      "/usr/include/mipsel-linux-gnu"
    };
@@ -58,7 +58,7 @@ Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
    const StringRef PPCMultiarchIncludeDirs[] = {
      "/usr/include/powerpc-linux-gnu"
    };
-@@ -2718,6 +2734,10 @@
+@@ -2749,6 +2765,10 @@
      MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
    } else if (getTriple().getArch() == llvm::Triple::mipsel) {
      MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
diff --git a/debian/patches/disable-execinfo-usage.diff b/debian/patches/disable-execinfo-usage.diff
index 64fb845f..2597a9eb 100644
--- a/debian/patches/disable-execinfo-usage.diff
+++ b/debian/patches/disable-execinfo-usage.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn193603/lldb/lib/Makefile
+Index: llvm-toolchain-snapshot_3.5~svn199197/lldb/lib/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn193603.orig/lldb/lib/Makefile	2013-10-29 12:26:27.542137766 +0100
-+++ llvm-toolchain-snapshot_3.4~svn193603/lldb/lib/Makefile	2013-10-29 12:26:27.542137766 +0100
-@@ -158,5 +158,6 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/lldb/lib/Makefile	2014-01-14 11:31:05.712868380 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/lldb/lib/Makefile	2014-01-14 11:31:05.708868380 +0100
+@@ -159,5 +159,6 @@
      # Allow unresolved symbols.
      LLVMLibsOptions += -Wl,--allow-shlib-undefined
      # Link in python
diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff
index 6d7d3fdc..72ad94d6 100644
--- a/debian/patches/fix-clang-path-and-build.diff
+++ b/debian/patches/fix-clang-path-and-build.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197156.orig/clang/lib/Driver/ToolChains.cpp	2013-12-12 16:37:40.637766690 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp	2013-12-12 16:37:40.637766690 +0100
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:22.796868045 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:22.792868045 +0100
 @@ -149,6 +149,7 @@
            A->getValue() == StringRef("soft"));
  }
@@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
  StringRef Darwin::getDarwinArchName(const ArgList &Args) const {
    switch (getTriple().getArch()) {
    default:
-@@ -2010,6 +2011,8 @@
+@@ -1977,6 +1978,8 @@
        DriverArgs.hasArg(options::OPT_nostdincxx))
      return;
  
diff --git a/debian/patches/force-gcc-header-obj.diff b/debian/patches/force-gcc-header-obj.diff
index 9e386fe9..2d36f3fc 100644
--- a/debian/patches/force-gcc-header-obj.diff
+++ b/debian/patches/force-gcc-header-obj.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197156.orig/clang/lib/Driver/ToolChains.cpp	2013-12-12 16:38:10.897767658 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp	2013-12-12 16:38:10.897767658 +0100
-@@ -2654,6 +2654,11 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:32.412867856 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:32.412867856 +0100
+@@ -2685,6 +2685,11 @@
      return;
    }
  
diff --git a/debian/patches/include-target.diff b/debian/patches/include-target.diff
index bba0021d..cb347610 100644
--- a/debian/patches/include-target.diff
+++ b/debian/patches/include-target.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197156.orig/clang/lib/Driver/ToolChains.cpp	2013-12-12 16:38:06.033767502 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp	2013-12-12 16:38:06.029767502 +0100
-@@ -2804,7 +2804,7 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:26.080867980 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:26.076867980 +0100
+@@ -2835,7 +2835,7 @@
  
  #ifdef __i386__
    // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him
diff --git a/debian/patches/libstdc++-header-i386.diff b/debian/patches/libstdc++-header-i386.diff
index 5ff40ee5..54dade4c 100644
--- a/debian/patches/libstdc++-header-i386.diff
+++ b/debian/patches/libstdc++-header-i386.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/Driver/ToolChains.cpp	2013-11-30 15:03:35.257604848 +0000
-+++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp	2013-11-30 15:04:14.793603425 +0000
-@@ -2771,6 +2771,11 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:10.916868278 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp	2014-01-14 11:31:10.916868278 +0100
+@@ -2830,6 +2830,11 @@
    StringRef BiarchSuffix = GCCInstallation.getBiarchSuffix();
    const GCCVersion &Version = GCCInstallation.getVersion();
  
diff --git a/debian/patches/lldb-link-atomic.diff b/debian/patches/lldb-link-atomic.diff
index ebf29f89..86fbee72 100644
--- a/debian/patches/lldb-link-atomic.diff
+++ b/debian/patches/lldb-link-atomic.diff
@@ -3,9 +3,11 @@ Author: Adam Conrad <adconrad@ubuntu.com>
 Forwarded: no
 Last-Update: 2013-08-21
 
---- llvm-toolchain-3.3-3.3.orig/lldb/lib/Makefile
-+++ llvm-toolchain-3.3-3.3/lldb/lib/Makefile
-@@ -140,6 +140,10 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
+Index: llvm-toolchain-snapshot_3.5~svn199197/lldb/lib/Makefile
+===================================================================
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/lldb/lib/Makefile	2014-01-14 11:31:38.652867733 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/lldb/lib/Makefile	2014-01-14 11:31:38.652867733 +0100
+@@ -149,6 +149,10 @@
      LLVMLibsOptions += -Wl,--no-undefined
      # Link in python
      LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt
diff --git a/debian/patches/profile_rt.diff b/debian/patches/profile_rt.diff
index a13697fc..11cdd84b 100644
--- a/debian/patches/profile_rt.diff
+++ b/debian/patches/profile_rt.diff
@@ -1,16 +1,16 @@
-Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/Tools.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/Tools.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Driver/Tools.cpp	2013-10-10 13:38:05.214083057 +0200
-+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/Tools.cpp	2013-10-10 13:38:05.206083056 +0200
-@@ -36,6 +36,7 @@
- #include "llvm/Support/Program.h"
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/Tools.cpp	2014-01-14 11:30:37.196868940 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/Tools.cpp	2014-01-14 11:30:37.192868940 +0100
+@@ -37,6 +37,7 @@
  #include "llvm/Support/Process.h"
+ #include "llvm/Support/Program.h"
  #include "llvm/Support/raw_ostream.h"
 +#include "llvm/Config/config.h"
  #include <sys/stat.h>
  
  using namespace clang::driver;
-@@ -221,7 +222,7 @@
+@@ -225,7 +226,7 @@
    // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is
    // not supported by old linkers.
    std::string ProfileRT =
diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff
index 92f5f13a..8fb48ff7 100644
--- a/debian/patches/python-clangpath.diff
+++ b/debian/patches/python-clangpath.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn193982/clang/bindings/python/clang/cindex.py
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/bindings/python/clang/cindex.py
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/bindings/python/clang/cindex.py	2013-11-04 09:46:51.136669417 +0100
-+++ llvm-toolchain-snapshot_3.4~svn193982/clang/bindings/python/clang/cindex.py	2013-11-04 09:46:51.136669417 +0100
-@@ -3358,7 +3358,7 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/bindings/python/clang/cindex.py	2014-01-14 11:31:18.444868130 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/bindings/python/clang/cindex.py	2014-01-14 11:31:18.440868130 +0100
+@@ -3371,7 +3371,7 @@
          elif name == 'Windows':
              file = 'libclang.dll'
          else:
diff --git a/debian/patches/removeduplicatedeclaration.diff b/debian/patches/removeduplicatedeclaration.diff
index 78e2151c..25b3306b 100644
--- a/debian/patches/removeduplicatedeclaration.diff
+++ b/debian/patches/removeduplicatedeclaration.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.5~svn197690/clang/lib/Basic/Targets.cpp
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn197690.orig/clang/lib/Basic/Targets.cpp	2013-12-19 17:16:04.036572985 +0100
-+++ llvm-toolchain-snapshot_3.5~svn197690/clang/lib/Basic/Targets.cpp	2013-12-19 17:16:04.032572984 +0100
-@@ -3757,33 +3757,6 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Basic/Targets.cpp	2014-01-14 11:31:20.680868086 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp	2014-01-14 11:31:20.676868086 +0100
+@@ -3747,33 +3747,6 @@
      // FIXME: Override "preferred align" for double and long long.
    }
  
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 677af454..35178f94 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn192346/clang/tools/scan-build/scan-build
+Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/tools/scan-build/scan-build	2013-10-10 13:38:20.858082707 +0200
-+++ llvm-toolchain-snapshot_3.4~svn192346/clang/tools/scan-build/scan-build	2013-10-10 13:38:20.854082707 +0200
-@@ -1547,7 +1547,7 @@
+--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/tools/scan-build/scan-build	2014-01-14 11:30:50.852868672 +0100
++++ llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build	2014-01-14 11:30:50.848868672 +0100
+@@ -1559,7 +1559,7 @@
  
  # Find 'clang'
  if (!defined $AnalyzerDiscoveryMethod) {