* Sync recent changes from the 3.3 branch

* Integrate patch to fix FTBFS under IA64.
* Disable the usage of binutils-gold under armel. It currently fails with:
  "attempt to map 2752512 bytes at offset 2066666 exceeds size of file;
  the file may be corrupt"

debian/changelog

@@ -1,4 +1,13 @@
-llvm-toolchain-snapshot (1:3.4~svn184294-1~exp1) UNRELEASED; urgency=low
+llvm-toolchain-snapshot (1:3.4~svn185325-1) unstable; urgency=low
+
+  * Sync recent changes from the 3.3 branch
+
+  [ Luca Falavigna ]
+  * Integrate patch to fix FTBFS under IA64.
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 01 Jul 2013 13:18:53 +0200
+
+llvm-toolchain-snapshot (1:3.3-2) unstable; urgency=low
 
   * Fix warning python-script-but-no-python-dep on clang-format-X.Y
   * manpages are generated during build time (simplifies maintenance)
@@ -6,6 +15,9 @@ llvm-toolchain-snapshot (1:3.4~svn184294-1~exp1) UNRELEASED; urgency=low
   * Move libjs-jquery & libjs-underscore dependencies to llvm-X.Y-doc
   * Add lldb-X.Y manpage
   * Hopefully fix the ftbfs under mipsel (mipsel-ftbfs.diff)
+  * Disable the usage of binutils-gold under armel. It currently fails with:
+    "attempt to map 2752512 bytes at offset 2066666 exceeds size of file;
+    the file may be corrupt"
 
   [ Léo Cavaillé ]
   * Add patch to find correctly LLVMGold.so with -O4 (Closes: #712437)
@@ -22,12 +34,6 @@ llvm-toolchain-snapshot (1:3.4~svn184294-1~exp1) experimental; urgency=low
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 19 Jun 2013 14:20:12 +0200
 
-llvm-toolchain-snapshot (1:3.4~svn184046-1~exp1) experimental; urgency=low
-
-  * New snapshot release
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 15 Jun 2013 19:39:43 +0200
-
 llvm-toolchain-snapshot (1:3.4~svn183914-1) unstable; urgency=low
 
   * New snapshot release

debian/control

@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl8.5, expect,
     sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9),
     lsb-release, patchutils, diffstat, xz-utils, chrpath, python-dev,
     libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libcloog-isl-dev,
-    libisl-dev (>= 0.11.1), binutils-gold [amd64 armel armhf i386 powerpc powerpcspe ppc64 sparc sparc64 x32],
+    libisl-dev (>= 0.11.1), binutils-gold [amd64 armhf i386 powerpc powerpcspe ppc64 sparc sparc64 x32],
     lcov, procps, help2man
 Build-Conflicts: oprofile, ocaml
 Standards-Version: 3.9.4

debian/patches/0003-Debian-version-info-and-bugreport.patch

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/lib/Support/CommandLine.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/lib/Support/CommandLine.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/Support/CommandLine.cpp	2013-06-19 11:13:57.582779558 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lib/Support/CommandLine.cpp	2013-07-01 13:27:34.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/lib/Support/CommandLine.cpp	2013-06-19 11:13:57.582779558 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lib/Support/CommandLine.cpp	2013-07-01 13:27:34.000000000 +0200
 @@ -1509,6 +1509,10 @@
      OS << LLVM_VERSION_INFO;
  #endif

debian/patches/0010-shared-lib-paths.patch

@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn184409/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184409/clang/lib/Driver/ToolChains.cpp	(revision 184409)
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Driver/ToolChains.cpp	2013-07-01 13:27:42.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184409/clang/lib/Driver/ToolChains.cpp	(working copy)
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/ToolChains.cpp	2013-07-01 13:28:26.000000000 +0200
-@@ -2328,6 +2328,13 @@
+@@ -2292,6 +2292,14 @@
    addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
    addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
  
@@ -13,14 +13,15 @@ Index: llvm-toolchain-snapshot_3.4~svn184409/clang/lib/Driver/ToolChains.cpp
 +                    Paths);
 +  }
 +
-   // Try walking via the GCC triple path in case of multiarch GCC
++
+   // Try walking via the GCC triple path in case of biarch or multiarch GCC
    // installations with strange symlinks.
    if (GCCInstallation.isValid())
-Index: llvm-toolchain-snapshot_3.4~svn184409/clang/lib/Driver/Tools.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/Tools.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184409/clang/lib/Driver/Tools.cpp	(revision 184409)
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Driver/Tools.cpp	2013-07-01 13:27:42.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184409/clang/lib/Driver/Tools.cpp	(working copy)
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/Tools.cpp	2013-07-01 13:27:42.000000000 +0200
-@@ -6147,6 +6147,14 @@
+@@ -6168,6 +6168,14 @@
    if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
      CmdArgs.push_back("-plugin");
      std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";

debian/patches/0021-shared-lib-debian.patch

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/tools/llvm-shlib/Makefile
+Index: llvm-toolchain-snapshot_3.4~svn185325/tools/llvm-shlib/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/tools/llvm-shlib/Makefile	2013-06-19 11:13:57.974779570 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/tools/llvm-shlib/Makefile	2013-07-01 13:28:31.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/tools/llvm-shlib/Makefile	2013-06-19 11:13:57.974779570 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/tools/llvm-shlib/Makefile	2013-07-01 13:28:31.000000000 +0200
 @@ -39,6 +39,12 @@
  LLVMLibsPaths   := $(IncludeInLibLlvm)
  
@@ -17,10 +17,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/tools/llvm-shlib/Makefile
      # set dylib internal version number to llvmCore submission number
 @@ -70,7 +76,7 @@
  
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
+ ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD GNU))
      # Add soname to the library.
 -    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
 +    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions
  endif
  
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU))
+ ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))

debian/patches/0023-link-libopagent.patch

@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/configure
+Index: llvm-toolchain-snapshot_3.4~svn185325/configure
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/configure	2013-06-19 11:13:58.370779593 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/configure	2013-07-01 13:28:33.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/configure	2013-06-19 11:13:58.366779571 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/configure	2013-07-01 13:28:33.000000000 +0200
-@@ -13681,7 +13681,7 @@
+@@ -13709,7 +13709,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~svn184290/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
-@@ -13777,7 +13777,7 @@
+@@ -13805,7 +13805,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~svn184290/configure
  
  fi
  
-@@ -13813,8 +13813,8 @@
+@@ -13841,8 +13841,8 @@
    if test -z "$ac_lib"; then
      ac_res="none required"
    else

debian/patches/0044-soname.diff

@@ -1,13 +1,13 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/tools/llvm-shlib/Makefile
+Index: llvm-toolchain-snapshot_3.4~svn185325/tools/llvm-shlib/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/tools/llvm-shlib/Makefile	2013-06-19 11:13:58.710779586 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/tools/llvm-shlib/Makefile	2013-07-01 13:28:34.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/tools/llvm-shlib/Makefile	2013-06-19 11:13:58.706779586 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/tools/llvm-shlib/Makefile	2013-07-01 13:28:34.000000000 +0200
 @@ -76,7 +76,7 @@
  
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
+ ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD GNU))
      # Add soname to the library.
 -    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions
 +    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions
  endif
  
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU))
+ ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))

debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch

@@ -12,11 +12,11 @@ This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850.
  test/DebugInfo/X86/ending-run.ll      |    6 ++----
  2 files changed, 4 insertions(+), 9 deletions(-)
 
-Index: llvm-toolchain-snapshot_3.4~svn184290/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	2013-06-19 11:13:59.122779597 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	2013-07-01 13:28:35.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	2013-06-19 11:13:59.118779599 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	2013-07-01 13:28:35.000000000 +0200
-@@ -1315,15 +1315,12 @@
+@@ -1312,15 +1312,12 @@
    if (!MI->isDebugValue()) {
      DebugLoc DL = MI->getDebugLoc();
      if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) {
@@ -33,10 +33,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/lib/CodeGen/AsmPrinter/DwarfDebug.c
        if (!DL.isUnknown()) {
          const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
          recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags);
-Index: llvm-toolchain-snapshot_3.4~svn184290/test/DebugInfo/X86/ending-run.ll
+Index: llvm-toolchain-snapshot_3.4~svn185325/test/DebugInfo/X86/ending-run.ll
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/test/DebugInfo/X86/ending-run.ll	2013-06-19 11:13:59.122779597 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/test/DebugInfo/X86/ending-run.ll	2013-07-01 13:28:35.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/test/DebugInfo/X86/ending-run.ll	2013-06-19 11:13:59.118779599 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/test/DebugInfo/X86/ending-run.ll	2013-07-01 13:28:35.000000000 +0200
 @@ -1,11 +1,9 @@
  ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj
  ; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s

debian/patches/0047-version-name.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/autoconf/configure.ac
+Index: llvm-toolchain-snapshot_3.4~svn185325/autoconf/configure.ac
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/autoconf/configure.ac	2013-06-19 11:13:59.530779611 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/autoconf/configure.ac	2013-07-01 13:28:40.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/autoconf/configure.ac	2013-06-19 11:13:59.514779605 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/autoconf/configure.ac	2013-07-01 13:28:40.000000000 +0200
 @@ -31,7 +31,7 @@
  dnl===-----------------------------------------------------------------------===
  dnl Initialize autoconf and define the package name, version number and
@@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/autoconf/configure.ac
  AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API])
  AC_DEFINE([LLVM_VERSION_MINOR], [4], [Minor version of the LLVM API])
  
-Index: llvm-toolchain-snapshot_3.4~svn184290/configure
+Index: llvm-toolchain-snapshot_3.4~svn185325/configure
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/configure	2013-06-19 11:13:59.530779611 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/configure	2013-07-01 13:28:40.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/configure	2013-06-19 11:13:59.522779599 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/configure	2013-07-01 13:28:40.000000000 +0200
 @@ -561,8 +561,8 @@
  # Identity of this package.
  PACKAGE_NAME='LLVM'

debian/patches/0050-powerpcspe-fp.diff

@@ -1,10 +1,10 @@
  PPCJITInfo.cpp |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-Index: llvm-toolchain-snapshot_3.4~svn184290/lib/Target/PowerPC/PPCJITInfo.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/lib/Target/PowerPC/PPCJITInfo.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/Target/PowerPC/PPCJITInfo.cpp	2013-06-19 11:14:00.422779630 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lib/Target/PowerPC/PPCJITInfo.cpp	2013-07-01 13:28:42.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/lib/Target/PowerPC/PPCJITInfo.cpp	2013-06-19 11:14:00.418779630 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lib/Target/PowerPC/PPCJITInfo.cpp	2013-07-01 13:28:42.000000000 +0200
 @@ -99,6 +99,7 @@
      "stw r8,  196(r1)\n"    "stw r7,  192(r1)\n"
      "stw r6,  188(r1)\n"    "stw r5,  184(r1)\n"

debian/patches/18-soname.patch

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/libclang/Makefile
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/tools/libclang/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/libclang/Makefile	2013-06-19 11:13:54.270779471 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/tools/libclang/Makefile	2013-07-01 13:26:38.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/libclang/Makefile	2013-06-19 11:13:54.266779456 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/tools/libclang/Makefile	2013-07-01 13:27:07.000000000 +0200
 @@ -14,6 +14,7 @@
  
  LINK_LIBS_IN_SHARED = 1
@@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/libclang/Makefile
 @@ -30,7 +31,7 @@
  
  # Add soname to the library.
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
+ ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD))
 -        LDFLAGS += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT)
 +        LDFLAGS += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_MAJOR)
  endif

debian/patches/21-searchPathHeaders.diff

@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Driver/ToolChains.cpp	2013-06-19 11:13:55.238779496 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Driver/ToolChains.cpp	2013-07-01 13:27:19.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/ToolChains.cpp	2013-06-19 11:13:55.234779499 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/ToolChains.cpp	2013-07-01 13:27:19.000000000 +0200
-@@ -2409,6 +2409,11 @@
+@@ -2366,6 +2366,11 @@
      addSystemInclude(DriverArgs, CC1Args, P.str());
    }
  

debian/patches/23-strlcpy_strlcat_warning_removed.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/include/clang/Basic/Builtins.def
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/include/clang/Basic/Builtins.def
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/include/clang/Basic/Builtins.def	2013-06-19 11:13:55.626779508 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/include/clang/Basic/Builtins.def	2013-07-01 13:27:26.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/include/clang/Basic/Builtins.def	2013-06-19 11:13:55.618779502 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/include/clang/Basic/Builtins.def	2013-07-01 13:27:26.000000000 +0200
 @@ -466,8 +466,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-snapshot_3.4~svn184290/clang/include/clang/Basic/Builtins.
  //   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-snapshot_3.4~svn184290/clang/lib/Sema/SemaChecking.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Sema/SemaChecking.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Sema/SemaChecking.cpp	2013-06-19 11:13:55.626779508 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Sema/SemaChecking.cpp	2013-07-01 13:27:26.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Sema/SemaChecking.cpp	2013-06-19 11:13:55.622779505 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Sema/SemaChecking.cpp	2013-07-01 13:27:26.000000000 +0200
-@@ -575,9 +575,10 @@
+@@ -580,9 +580,10 @@
      return false;
  
    // Handle memory setting and copying functions.
@@ -42,11 +42,11 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Sema/SemaChecking.cpp
      CheckStrncatArguments(TheCall, FnInfo);
    else
      CheckMemaccessArguments(TheCall, CMId, FnInfo);
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/AST/Decl.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/AST/Decl.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/AST/Decl.cpp	2013-06-19 11:13:55.626779508 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/AST/Decl.cpp	2013-07-01 13:27:26.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/AST/Decl.cpp	2013-06-19 11:13:55.622779505 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/AST/Decl.cpp	2013-07-01 13:27:26.000000000 +0200
-@@ -2806,10 +2806,10 @@
+@@ -2789,10 +2789,10 @@
    case Builtin::BImemmove:
      return Builtin::BImemmove;
  
@@ -61,10 +61,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/AST/Decl.cpp
  
    case Builtin::BI__builtin_memcmp:
    case Builtin::BImemcmp:
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-06-19 11:13:55.626779508 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-07-01 13:27:26.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-06-19 11:13:55.622779505 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp	2013-07-01 13:27:26.000000000 +0200
 @@ -238,9 +238,9 @@
      case Builtin::BIstrncpy:
      case Builtin::BIstrncat:

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.4~svn184290/clang/lib/Driver/Tools.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/Tools.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Driver/Tools.cpp	2013-06-19 11:13:56.406779526 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Driver/Tools.cpp	2013-07-01 13:27:28.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp	2013-06-19 11:13:56.402779526 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/Tools.cpp	2013-07-01 13:27:28.000000000 +0200
-@@ -675,7 +675,7 @@
+@@ -683,7 +683,7 @@
          FloatABI = "hard";
          break;
        case llvm::Triple::GNUEABI:

debian/patches/27-fix_clang_stdint.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Headers/stdint.h
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Headers/stdint.h
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Headers/stdint.h	2013-06-19 11:13:56.014779511 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Headers/stdint.h	2013-07-01 13:27:27.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Headers/stdint.h	2013-06-19 11:13:56.010779511 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Headers/stdint.h	2013-07-01 13:27:27.000000000 +0200
 @@ -22,8 +22,6 @@
   *
  \*===----------------------------------------------------------------------===*/

debian/patches/30-kfreebsd.diff

@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/ToolChains.h
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/ToolChains.h
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Driver/ToolChains.h	2013-06-15 19:43:09.000000000 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Driver/ToolChains.h	2013-07-01 13:27:32.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/ToolChains.h	2013-06-15 19:43:09.000000000 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/ToolChains.h	2013-07-01 13:27:32.000000000 +0200
-@@ -127,6 +127,8 @@
+@@ -129,6 +129,8 @@
    virtual bool isPICDefault() const;
    virtual bool isPIEDefault() const;
    virtual bool isPICDefaultForced() const;
@@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/ToolChains.h
  
  protected:
    virtual Tool *getTool(Action::ActionClass AC) const;
-Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Driver/ToolChains.cpp	2013-06-15 19:43:09.000000000 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Driver/ToolChains.cpp	2013-07-01 13:27:32.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/ToolChains.cpp	2013-06-15 19:43:09.000000000 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/ToolChains.cpp	2013-07-01 13:27:32.000000000 +0200
-@@ -953,6 +953,13 @@
+@@ -942,6 +942,13 @@
    return GoodVersion;
  }
  

debian/patches/31-powerpcspe.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Lex/Makefile
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Lex/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Lex/Makefile	2013-06-19 11:14:01.434779657 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Lex/Makefile	2013-07-01 13:28:43.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Lex/Makefile	2013-06-19 11:14:01.430779659 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Lex/Makefile	2013-07-01 13:28:43.000000000 +0200
 @@ -17,8 +17,10 @@
  LIBRARYNAME := clangLex
  

debian/patches/33-armhf-defaults.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.4~svn184290/clang/lib/Driver/Tools.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/Tools.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Driver/Tools.cpp	2013-06-19 11:14:02.002779657 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Driver/Tools.cpp	2013-07-01 13:28:44.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp	2013-06-19 11:14:01.998779666 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/Tools.cpp	2013-07-01 13:28:44.000000000 +0200
-@@ -493,6 +493,9 @@
+@@ -492,6 +492,9 @@
    if (Arg *A = Args.getLastArg(options::OPT_march_EQ)) {
      // Otherwise, if we have -march= choose the base CPU for that arch.
      MArch = A->getValue();
@@ -32,7 +32,7 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp
    } else {
      // Otherwise, use the Arch from the triple.
      MArch = Triple.getArchName();
-@@ -788,8 +791,19 @@
+@@ -796,8 +799,19 @@
    }
  
    // Honor -mfpu=.

debian/patches/34-powerpc-no-altivec.diff

@@ -6,10 +6,10 @@ Reviewed-By: Colin Watson <cjwatson@ubuntu.com>
 
 Last-Update: 2013-04-01
 
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Lex/Makefile
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Lex/Makefile
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Lex/Makefile	2013-06-19 11:14:02.478779684 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Lex/Makefile	2013-07-01 13:28:48.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Lex/Makefile	2013-06-19 11:14:02.474779686 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Lex/Makefile	2013-07-01 13:28:48.000000000 +0200
 @@ -16,11 +16,5 @@
  
  LIBRARYNAME := clangLex

debian/patches/clang-format-version.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format.py
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format.py
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/clang-format/clang-format.py	2013-06-19 11:14:03.630779723 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/tools/clang-format/clang-format.py	2013-07-01 13:31:50.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format.py	2013-06-19 11:14:03.626779732 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format.py	2013-07-01 13:31:50.000000000 +0200
 @@ -23,7 +23,7 @@
  import vim
  
@@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-form
  
  # Change this to format according to other formatting styles (see 
  # clang-format -help)
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format-diff.py
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/clang-format/clang-format-diff.py	2013-06-19 11:14:03.630779723 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/tools/clang-format/clang-format-diff.py	2013-07-01 13:31:50.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format-diff.py	2013-06-19 11:14:03.626779732 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format-diff.py	2013-07-01 13:31:50.000000000 +0200
 @@ -28,7 +28,7 @@
  
  
@@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-form
  
  
  def getOffsetLength(filename, line_number, line_count):
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format.el
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format.el
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/clang-format/clang-format.el	2013-06-19 11:14:03.630779723 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/tools/clang-format/clang-format.el	2013-07-01 13:31:50.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format.el	2013-06-19 11:14:03.626779732 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/tools/clang-format/clang-format.el	2013-07-01 13:31:50.000000000 +0200
 @@ -13,7 +13,7 @@
  
  ;; *Location of the clang-format binary. If it is on your PATH, a full path name

debian/patches/declare_clear_cache.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/lib/Support/Unix/Memory.inc
+Index: llvm-toolchain-snapshot_3.4~svn185325/lib/Support/Unix/Memory.inc
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/Support/Unix/Memory.inc	2013-06-19 11:14:00.914779646 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lib/Support/Unix/Memory.inc	2013-07-01 13:28:43.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/lib/Support/Unix/Memory.inc	2013-06-19 11:14:00.910779646 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lib/Support/Unix/Memory.inc	2013-07-01 13:28:43.000000000 +0200
 @@ -336,7 +336,7 @@
    // FIXME: Can we safely always call this for __GNUC__ everywhere?
    const char *Start = static_cast<const char *>(Addr);

debian/patches/ia64-fix.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/lib/ExecutionEngine/JIT/JIT.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/lib/ExecutionEngine/JIT/JIT.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/ExecutionEngine/JIT/JIT.cpp	2013-06-19 11:14:03.050779689 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lib/ExecutionEngine/JIT/JIT.cpp	2013-07-01 13:28:56.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/lib/ExecutionEngine/JIT/JIT.cpp	2013-06-19 11:14:03.046779699 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lib/ExecutionEngine/JIT/JIT.cpp	2013-07-01 13:28:56.000000000 +0200
 @@ -68,7 +68,7 @@
  }
  
@@ -11,3 +11,59 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/lib/ExecutionEngine/JIT/JIT.cpp
       !defined(__USING_SJLJ_EXCEPTIONS__))
  #define HAVE_EHTABLE_SUPPORT 1
  #else
+Index: llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
+===================================================================
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp	2013-07-01 13:28:56.000000000 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp	2013-07-01 13:28:56.000000000 +0200
+@@ -115,12 +115,14 @@
+                 verbose_log->Printf("PTRACE_SETREGS %s", buf.GetData());
+                 break;
+             }
++#ifdef PTRACE_SETFPREGS
+         case PTRACE_SETFPREGS:
+             {
+                 DisplayBytes(buf, data, data_size);
+                 verbose_log->Printf("PTRACE_SETFPREGS %s", buf.GetData());
+                 break;
+             }
++#endif
+         case PTRACE_SETSIGINFO:
+             {
+                 DisplayBytes(buf, data, sizeof(siginfo_t));
+@@ -583,9 +585,11 @@
+ void
+ ReadFPROperation::Execute(ProcessMonitor *monitor)
+ {
++#ifdef PTRACE_GETFPREGS
+     if (PTRACE(PTRACE_GETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
+         m_result = false;
+     else
++#endif
+         m_result = true;
+ }
+ 
+@@ -668,9 +672,11 @@
+ void
+ WriteFPROperation::Execute(ProcessMonitor *monitor)
+ {
++#ifdef PTRACE_SETFPREGS
+     if (PTRACE(PTRACE_SETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
+         m_result = false;
+     else
++#endif
+         m_result = true;
+ }
+ 
+Index: llvm-toolchain-snapshot_3.4~svn185325/lib/ExecutionEngine/RTDyldMemoryManager.cpp
+===================================================================
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lib/ExecutionEngine/RTDyldMemoryManager.cpp	2013-06-04 11:09:15.000000000 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lib/ExecutionEngine/RTDyldMemoryManager.cpp	2013-07-01 13:31:45.000000000 +0200
+@@ -33,7 +33,7 @@
+ RTDyldMemoryManager::~RTDyldMemoryManager() {}
+ 
+ // Determine whether we can register EH tables.
+-#if (defined(__GNUC__) && !defined(__ARM_EABI__) && \
++#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \
+      !defined(__USING_SJLJ_EXCEPTIONS__))
+ #define HAVE_EHTABLE_SUPPORT 1
+ #else

debian/patches/kfreebsd.diff

@@ -1,20 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/lldb/include/lldb/Host/Config.h
+Index: llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Core/Mangled.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/lldb/include/lldb/Host/Config.h	2013-06-19 11:14:04.194779756 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lldb/source/Core/Mangled.cpp	2013-07-01 13:32:01.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/lldb/include/lldb/Host/Config.h	2013-06-19 11:14:04.190779765 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Core/Mangled.cpp	2013-07-01 13:32:01.000000000 +0200
-@@ -18,7 +18,7 @@
- 
- #include "lldb/Host/linux/Config.h"
- 
--#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
- 
- #include "lldb/Host/freebsd/Config.h"
- 
-Index: llvm-toolchain-snapshot_3.4~svn184290/lldb/source/Core/Mangled.cpp
-===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/lldb/source/Core/Mangled.cpp	2013-06-19 11:14:04.194779756 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/lldb/source/Core/Mangled.cpp	2013-06-19 11:14:04.190779765 +0200
 @@ -31,6 +31,7 @@
  #include <ctype.h>
  #include <string.h>
@@ -23,28 +10,3 @@ Index: llvm-toolchain-snapshot_3.4~svn184290/lldb/source/Core/Mangled.cpp
  
  using namespace lldb_private;
  
-Index: llvm-toolchain-snapshot_3.4~svn184290/lldb/source/Host/common/Host.cpp
-===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/lldb/source/Host/common/Host.cpp	2013-06-19 11:14:04.194779756 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/lldb/source/Host/common/Host.cpp	2013-06-19 11:14:04.190779765 +0200
-@@ -151,7 +151,7 @@
-     delete info;
- 
-     int status = -1;
--#if defined (__FreeBSD__)
-+#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
-     #define __WALL 0
- #endif
-     const int options = __WALL;
-@@ -1460,7 +1460,11 @@
-         g_num_cores = 0;
-         int num_cores = 0;
-         size_t num_cores_len = sizeof(num_cores);
-+#ifdef HW_AVAILCPU
-         int mib[] = { CTL_HW, HW_AVAILCPU };
-+#else
-+        int mib[] = { CTL_HW, HW_NCPU };
-+#endif
-         
-         /* get the number of CPUs from the system */
-         if (sysctl(mib, sizeof(mib)/sizeof(int), &num_cores, &num_cores_len, NULL, 0) == 0 && (num_cores > 0))

debian/patches/kfreebsd_ptrace_kludge.diff

@@ -0,0 +1,81 @@
+Index: llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Host/freebsd/Host.cpp
+===================================================================
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lldb/source/Host/freebsd/Host.cpp	2013-07-01 13:32:48.000000000 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Host/freebsd/Host.cpp	2013-07-01 13:32:48.000000000 +0200
+@@ -20,6 +20,35 @@
+ #include <sys/exec.h>
+ #include <machine/elf.h>
+ 
++#include <signal.h>
++#include <sys/kern/param.h>
++#include <machine/reg.h>
++
++#define	PT_LWPINFO	13	/* Info about the LWP that stopped. */
++#define PT_GETNUMLWPS	14	/* get total number of threads */
++#define PT_GETLWPLIST	15	/* get thread list */
++
++/* Argument structure for PT_LWPINFO. */
++struct ptrace_lwpinfo {
++	__lwpid_t	pl_lwpid;	/* LWP described. */
++	int	pl_event;	/* Event that stopped the LWP. */
++#define	PL_EVENT_NONE	0
++#define	PL_EVENT_SIGNAL	1
++	int	pl_flags;	/* LWP flags. */
++#define	PL_FLAG_SA	0x01	/* M:N thread */
++#define	PL_FLAG_BOUND	0x02	/* M:N bound thread */
++#define	PL_FLAG_SCE	0x04	/* syscall enter point */
++#define	PL_FLAG_SCX	0x08	/* syscall leave point */
++#define	PL_FLAG_EXEC	0x10	/* exec(2) succeeded */
++#define	PL_FLAG_SI	0x20	/* siginfo is valid */
++#define	PL_FLAG_FORKED	0x40	/* new child */
++#define	PL_FLAG_CHILD	0x80	/* I am from child */
++	sigset_t	pl_sigmask;	/* LWP signal mask */
++	sigset_t	pl_siglist;	/* LWP pending signal */
++	struct siginfo	pl_siginfo;	/* siginfo for signal */
++	char		pl_tdname[MAXCOMLEN + 1]; /* LWP name */
++	int		pl_child_pid;	/* New child pid */
++};
+ 
+ // C++ Includes
+ // Other libraries and framework includes
+Index: llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
+===================================================================
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp	2013-07-01 13:32:48.000000000 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp	2013-07-01 13:32:48.000000000 +0200
+@@ -18,6 +18,36 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
++#include <signal.h>
++#include <sys/kern/param.h>
++#include <machine/reg.h>
++
++#define	PT_LWPINFO	13	/* Info about the LWP that stopped. */
++#define PT_GETNUMLWPS	14	/* get total number of threads */
++#define PT_GETLWPLIST	15	/* get thread list */
++
++/* Argument structure for PT_LWPINFO. */
++struct ptrace_lwpinfo {
++	__lwpid_t	pl_lwpid;	/* LWP described. */
++	int	pl_event;	/* Event that stopped the LWP. */
++#define	PL_EVENT_NONE	0
++#define	PL_EVENT_SIGNAL	1
++	int	pl_flags;	/* LWP flags. */
++#define	PL_FLAG_SA	0x01	/* M:N thread */
++#define	PL_FLAG_BOUND	0x02	/* M:N bound thread */
++#define	PL_FLAG_SCE	0x04	/* syscall enter point */
++#define	PL_FLAG_SCX	0x08	/* syscall leave point */
++#define	PL_FLAG_EXEC	0x10	/* exec(2) succeeded */
++#define	PL_FLAG_SI	0x20	/* siginfo is valid */
++#define	PL_FLAG_FORKED	0x40	/* new child */
++#define	PL_FLAG_CHILD	0x80	/* I am from child */
++	sigset_t	pl_sigmask;	/* LWP signal mask */
++	sigset_t	pl_siglist;	/* LWP pending signal */
++	struct siginfo	pl_siginfo;	/* siginfo for signal */
++	char		pl_tdname[MAXCOMLEN + 1]; /* LWP name */
++	int		pl_child_pid;	/* New child pid */
++};
++
+ // C++ Includes
+ // Other libraries and framework includes
+ #include "lldb/Core/Error.h"

debian/patches/kfreebsd_v2.diff

@@ -0,0 +1,307 @@
+--- a/lldb/source/Host/common/Host.cpp
++++ b/lldb/source/Host/common/Host.cpp
+@@ -27,7 +27,7 @@
+ #include <mach-o/dyld.h>
+ #include <mach/mach_port.h>
+ 
+-#elif defined (__linux__) || defined(__FreeBSD_kernel__)
++#elif defined (__linux__) || defined(__GLIBC__)
+ /*  Linux or the FreeBSD kernel with glibc (Debian KFreeBSD for example) */
+ 
+ #include <sys/wait.h>
+@@ -524,7 +524,7 @@
+ {
+ }
+ 
+-#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__linux__) // see macosx/Host.mm
++#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) && !defined (__linux__) // see macosx/Host.mm
+ 
+ void
+ Host::ThreadCreated (const char *thread_name)
+@@ -544,7 +544,7 @@
+     return 0;
+ }
+ 
+-#endif // #if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__linux__)
++#endif // #if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) && !defined (__linux__)
+ 
+ struct HostThreadCreateInfo
+ {
+@@ -684,7 +684,7 @@
+             return true;
+     }
+     return false;
+-#elif defined (__linux__)
++#elif defined (__linux__) || defined (__GLIBC__)
+     void *fn = dlsym (RTLD_DEFAULT, "pthread_setname_np");
+     if (fn)
+     {
+@@ -742,7 +742,7 @@
+             exe_path[len] = 0;
+             g_program_filespec.SetFile(exe_path, false);
+         }
+-#elif defined (__FreeBSD__)
++#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
+         int exe_path_mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, getpid() };
+         size_t exe_path_size;
+         if (sysctl(exe_path_mib, 4, NULL, &exe_path_size, NULL, 0) == 0)
+@@ -1180,7 +1180,7 @@
+     return NULL;
+ }
+ 
+-#if !defined (__APPLE__) && !defined (__FreeBSD__) // see macosx/Host.mm
++#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) // see macosx/Host.mm
+ bool
+ Host::GetOSBuildString (std::string &s)
+ {
+@@ -1229,7 +1229,7 @@
+ }
+ #endif // #if !defined (__APPLE__) && !defined(__linux__)
+ 
+-#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined(__linux__)
++#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) && !defined(__linux__)
+ bool
+ Host::GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &process_info)
+ {
+@@ -1443,7 +1443,7 @@
+     static uint32_t g_num_cores = UINT32_MAX;
+     if (g_num_cores == UINT32_MAX)
+     {
+-#if defined(__APPLE__) or defined (__linux__) or defined (__FreeBSD__)
++#if defined(__APPLE__) or defined (__linux__) or defined (__FreeBSD__) or defined (__FreeBSD_kernel__)
+ 
+         g_num_cores = ::sysconf(_SC_NPROCESSORS_ONLN);
+         
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -275,10 +275,12 @@
+   BuildMode := Release
+   # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
+   ifneq ($(HOST_OS),FreeBSD)
++  ifneq ($(HOST_OS),GNU/kFreeBSD)
+   ifneq ($(HOST_OS),Darwin)
+     OmitFramePointer := -fomit-frame-pointer
+   endif
+   endif
++  endif
+ 
+   CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
+   C.Flags   += $(OPTIMIZE_OPTION) $(OmitFramePointer)
+@@ -1454,7 +1456,7 @@
+ endif
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD GNU))
++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD GNU/kFreeBSD GNU))
+ ifneq ($(ARCH), Mips)
+   LD.Flags += -Wl,--version-script=$(LLVM_SRC_ROOT)/autoconf/ExportMap.map
+ endif
+--- a/autoconf/configure.ac
++++ b/autoconf/configure.ac
+@@ -222,11 +222,16 @@
+     llvm_cv_no_link_all_option="-Wl,-noall_load"
+     llvm_cv_os_type="Minix"
+     llvm_cv_platform_type="Unix" ;;
+-  *-*-freebsd* | *-*-kfreebsd-gnu)
++  *-*-freebsd*)
+     llvm_cv_link_all_option="-Wl,--whole-archive"
+     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
+     llvm_cv_os_type="FreeBSD"
+     llvm_cv_platform_type="Unix" ;;
++  *-*-kfreebsd-gnu)
++    llvm_cv_link_all_option="-Wl,--whole-archive"
++    llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
++    llvm_cv_os_type="GNU/kFreeBSD"
++    llvm_cv_platform_type="Unix" ;;
+   *-*-openbsd*)
+     llvm_cv_link_all_option="-Wl,--whole-archive"
+     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
+@@ -317,8 +322,10 @@
+     llvm_cv_target_os_type="Darwin" ;;
+   *-*-minix*)
+     llvm_cv_target_os_type="Minix" ;;
+-  *-*-freebsd* | *-*-kfreebsd-gnu)
++  *-*-freebsd*)
+     llvm_cv_target_os_type="FreeBSD" ;;
++  *-*-kfreebsd-gnu)
++    llvm_cv_target_os_type="GNU/kFreeBSD" ;;
+   *-*-openbsd*)
+     llvm_cv_target_os_type="OpenBSD" ;;
+   *-*-netbsd*)
+--- a/clang/tools/libclang/Makefile
++++ b/clang/tools/libclang/Makefile
+@@ -30,7 +30,7 @@
+ include $(CLANG_LEVEL)/Makefile
+ 
+ # Add soname to the library.
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD))
+         LDFLAGS += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_MAJOR)
+ endif
+ 
+--- a/configure
++++ b/configure
+@@ -3824,11 +3824,16 @@
+     llvm_cv_no_link_all_option="-Wl,-noall_load"
+     llvm_cv_os_type="Minix"
+     llvm_cv_platform_type="Unix" ;;
+-  *-*-freebsd* | *-*-kfreebsd-gnu)
++  *-*-freebsd*)
+     llvm_cv_link_all_option="-Wl,--whole-archive"
+     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
+     llvm_cv_os_type="FreeBSD"
+     llvm_cv_platform_type="Unix" ;;
++  *-*-kfreebsd-gnu)
++    llvm_cv_link_all_option="-Wl,--whole-archive"
++    llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
++    llvm_cv_os_type="GNU/kFreeBSD"
++    llvm_cv_platform_type="Unix" ;;
+   *-*-openbsd*)
+     llvm_cv_link_all_option="-Wl,--whole-archive"
+     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
+@@ -3925,8 +3930,10 @@
+     llvm_cv_target_os_type="Darwin" ;;
+   *-*-minix*)
+     llvm_cv_target_os_type="Minix" ;;
+-  *-*-freebsd* | *-*-kfreebsd-gnu)
++  *-*-freebsd*)
+     llvm_cv_target_os_type="FreeBSD" ;;
++  *-*-kfreebsd-gnu)
++    llvm_cv_target_os_type="GNU/kFreeBSD" ;;
+   *-*-openbsd*)
+     llvm_cv_target_os_type="OpenBSD" ;;
+   *-*-netbsd*)
+--- a/lldb/lib/Makefile
++++ b/lldb/lib/Makefile
+@@ -99,7 +99,7 @@
+               lldbPluginDynamicLoaderMacOSX.a
+ endif
+ 
+-ifeq ($(HOST_OS),FreeBSD)
++ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
+   USEDLIBS += lldbHostFreeBSD.a \
+               lldbPluginProcessPOSIX.a \
+               lldbPluginProcessFreeBSD.a
+@@ -132,7 +132,7 @@
+     endif
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU))
++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
+     # Include everything from the .a's into the shared library.
+     ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \
+                        -Wl,--no-whole-archive
+--- a/lldb/source/Host/Makefile
++++ b/lldb/source/Host/Makefile
+@@ -21,7 +21,7 @@
+ DIRS += linux
+ endif
+ 
+-ifeq ($(HOST_OS),FreeBSD)
++ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
+ DIRS += freebsd
+ endif
+ 
+--- a/lldb/source/Plugins/Platform/Makefile
++++ b/lldb/source/Plugins/Platform/Makefile
+@@ -24,5 +24,9 @@
+ # ifeq ($(HOST_OS),FreeBSD)
+ #   DIRS += FreeBSD
+ # endif
++# 
++# ifeq ($(HOST_OS),GNU/kFreeBSD)
++#   DIRS += FreeBSD
++# endif
+ 
+ include $(LLDB_LEVEL)/Makefile
+--- a/lldb/source/Plugins/Process/POSIX/Makefile
++++ b/lldb/source/Plugins/Process/POSIX/Makefile
+@@ -24,7 +24,7 @@
+ CPPFLAGS += -Wno-extended-offsetof
+ endif
+ 
+-ifeq ($(HOST_OS),FreeBSD)
++ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
+ # Extend the include path so we may locate ProcessMonitor
+ CPPFLAGS += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Process/FreeBSD
+ endif
+--- a/projects/sample/Makefile.llvm.rules
++++ b/projects/sample/Makefile.llvm.rules
+@@ -208,10 +208,12 @@
+   BuildMode := Release
+   # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
+   ifneq ($(HOST_OS),FreeBSD)
++  ifneq ($(HOST_OS),GNU/kFreeBSD)
+   ifneq ($(HOST_OS),Darwin)
+     OmitFramePointer := -fomit-frame-pointer
+   endif
+   endif
++  endif
+ 
+   # Darwin requires -fstrict-aliasing to be explicitly enabled.
+   # Avoid -fstrict-aliasing on Darwin for now, there are unresolved issues
+@@ -1372,7 +1374,7 @@
+ endif
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD))
++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD GNU/kFreeBSD))
+ ifneq ($(ARCH), Mips)
+   LD.Flags += -Wl,--version-script=$(PROJ_SRC_ROOT)/autoconf/ExportMap.map
+ endif
+--- a/tools/llvm-shlib/Makefile
++++ b/tools/llvm-shlib/Makefile
+@@ -69,18 +69,18 @@
+     endif
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD GNU Bitrig))
++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig))
+     # Include everything from the .a's into the shared library.
+     LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
+                        -Wl,--no-whole-archive
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD GNU))
+     # Add soname to the library.
+     LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU))
++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
+     # Don't allow unresolved symbols.
+     LLVMLibsOptions += -Wl,--no-undefined
+ endif
+--- a/lldb/source/Plugins/Makefile
++++ b/lldb/source/Plugins/Makefile
+@@ -36,7 +36,7 @@
+ DIRS += Process/Linux Process/POSIX
+ endif
+ 
+-ifeq ($(HOST_OS),FreeBSD)
++ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
+ DIRS += Process/FreeBSD Process/POSIX
+ endif
+ 
+--- a/lldb/tools/driver/Makefile
++++ b/lldb/tools/driver/Makefile
+@@ -21,7 +21,7 @@
+ 	LLVMLibsOptions += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,"$(PROJ_SRC_DIR)/lldb-Info.plist"
+ endif
+ 
+-ifeq ($(HOST_OS),Linux)
++ifneq (,$(filter $(HOST_OS), Linux GNU/kFreeBSD))
+ 	LLVMLibsOptions += -Wl,-rpath,$(LibDir)
+ endif
+ 
+--- a/lldb/tools/lldb-platform/Makefile
++++ b/lldb/tools/lldb-platform/Makefile
+@@ -18,6 +18,6 @@
+ 	LLVMLibsOptions += -Wl,-rpath,@loader_path/../lib/
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD))
++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD))
+ 	LLVMLibsOptions += -Wl,-rpath,$(LibDir)
+ endif

debian/patches/mipsel-ftbfs.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-3.3-3.3/lldb/source/Plugins/Process/Linux/LinuxSignals.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Plugins/Process/Linux/LinuxSignals.cpp
 ===================================================================
---- llvm-toolchain-3.3-3.3.orig/lldb/source/Plugins/Process/Linux/LinuxSignals.cpp	2013-06-20 10:10:31.000000000 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lldb/source/Plugins/Process/Linux/LinuxSignals.cpp	2013-07-01 13:32:46.000000000 +0200
-+++ llvm-toolchain-3.3-3.3/lldb/source/Plugins/Process/Linux/LinuxSignals.cpp	2013-06-20 10:11:57.000000000 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Plugins/Process/Linux/LinuxSignals.cpp	2013-07-01 13:32:46.000000000 +0200
 @@ -45,7 +45,9 @@
      ADDSIGNAL(PIPE,   false,  true,  true, "write to pipe with reading end closed");
      ADDSIGNAL(ALRM,   false,  false, true, "alarm");
@@ -12,10 +12,10 @@ Index: llvm-toolchain-3.3-3.3/lldb/source/Plugins/Process/Linux/LinuxSignals.cpp
      ADDSIGNAL(CHLD,   false,  false, true, "child process exit");
      ADDSIGNAL(CONT,   false,  true,  true, "process continue");
      ADDSIGNAL(STOP,   false,  true,  true, "process stop");
-Index: llvm-toolchain-3.3-3.3/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
 ===================================================================
---- llvm-toolchain-3.3-3.3.orig/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp	2013-06-20 10:10:31.000000000 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp	2013-07-01 13:32:46.000000000 +0200
-+++ llvm-toolchain-3.3-3.3/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp	2013-06-20 10:11:57.000000000 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp	2013-07-01 13:32:46.000000000 +0200
 @@ -149,7 +149,7 @@
  
              // TOOD: need a better way to detect when "long double" types are 

debian/patches/profile_rt.diff

@@ -1,9 +1,9 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/Tools.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Driver/Tools.cpp	2013-06-19 11:13:56.794779535 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/lib/Driver/Tools.cpp	2013-07-01 13:27:29.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp	2013-06-19 11:13:56.790779531 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/lib/Driver/Tools.cpp	2013-07-01 13:27:29.000000000 +0200
 @@ -34,6 +34,7 @@
- #include "llvm/Support/PathV1.h"
+ #include "llvm/Support/Program.h"
  #include "llvm/Support/Process.h"
  #include "llvm/Support/raw_ostream.h"
 +#include "llvm/Config/config.h"

debian/patches/scan-build-clang-path.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/scan-build/scan-build
+Index: llvm-toolchain-snapshot_3.4~svn185325/clang/tools/scan-build/scan-build
 ===================================================================
---- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/scan-build/scan-build	2013-06-19 11:13:59.982779627 +0200
+--- llvm-toolchain-snapshot_3.4~svn185325.orig/clang/tools/scan-build/scan-build	2013-07-01 13:28:41.000000000 +0200
-+++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/scan-build/scan-build	2013-06-19 11:13:59.978779615 +0200
++++ llvm-toolchain-snapshot_3.4~svn185325/clang/tools/scan-build/scan-build	2013-07-01 13:28:41.000000000 +0200
 @@ -1538,7 +1538,7 @@
  
  # Find 'clang'

debian/patches/series

@@ -24,3 +24,5 @@ ia64-fix.diff
 clang-format-version.diff
 kfreebsd.diff
 mipsel-ftbfs.diff
+kfreebsd_ptrace_kludge.diff
+#kfreebsd_v2.diff