Remove kfreebsd patches (applied upstream)

debian/changelog

@@ -1,4 +1,4 @@
-llvm-toolchain-snapshot (1:3.4~svn190038-1) unstable; urgency=low
+llvm-toolchain-snapshot (1:3.4~svn190051-1) unstable; urgency=low
 
   * New snapshot release
   * Merge changes from the 3.3 branch (see 1:3.3-9)

debian/patches/kfreebsd_target_info_clang33.diff

@@ -1,51 +0,0 @@
---- a/clang/lib/Basic/Targets.cpp
-+++ b/clang/lib/Basic/Targets.cpp
-@@ -283,6 +283,30 @@
-     }
- };
- 
-+// GNU/kFreeBSD Target
-+template<typename Target>
-+class KFreeBSDTargetInfo : public OSTargetInfo<Target> {
-+protected:
-+  virtual void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
-+                            MacroBuilder &Builder) const {
-+    // GNU/kFreeBSD defines; list based off of gcc output
-+
-+    DefineStd(Builder, "unix", Opts);
-+    Builder.defineMacro("__FreeBSD_kernel__");
-+    Builder.defineMacro("__GLIBC__");
-+    Builder.defineMacro("__ELF__");
-+    if (Opts.POSIXThreads)
-+      Builder.defineMacro("_REENTRANT");
-+    if (Opts.CPlusPlus)
-+      Builder.defineMacro("_GNU_SOURCE");
-+  }
-+public:
-+  KFreeBSDTargetInfo(const std::string &triple)
-+    : OSTargetInfo<Target>(triple) {
-+    this->UserLabelPrefix = "";
-+  }
-+};
-+
- // Minix Target
- template<typename Target>
- class MinixTargetInfo : public OSTargetInfo<Target> {
-@@ -5434,6 +5458,8 @@
-       return new BitrigI386TargetInfo(T);
-     case llvm::Triple::FreeBSD:
-       return new FreeBSDTargetInfo<X86_32TargetInfo>(T);
-+    case llvm::Triple::KFreeBSD:
-+      return new KFreeBSDTargetInfo<X86_32TargetInfo>(T);
-     case llvm::Triple::Minix:
-       return new MinixTargetInfo<X86_32TargetInfo>(T);
-     case llvm::Triple::Solaris:
-@@ -5473,6 +5499,8 @@
-       return new BitrigX86_64TargetInfo(T);
-     case llvm::Triple::FreeBSD:
-       return new FreeBSDTargetInfo<X86_64TargetInfo>(T);
-+    case llvm::Triple::KFreeBSD:
-+      return new KFreeBSDTargetInfo<X86_64TargetInfo>(T);
-     case llvm::Triple::Solaris:
-       return new SolarisTargetInfo<X86_64TargetInfo>(T);
-     case llvm::Triple::MinGW32:

debian/patches/libstdc++-header-i386.diff

@@ -1,15 +1,17 @@
-Index: llvm-toolchain-3.3-3.3/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-snapshot_3.4~svn190038/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-3.3-3.3.orig/clang/lib/Driver/ToolChains.cpp	2013-09-03 14:04:41.000000000 +0000
+--- llvm-toolchain-snapshot_3.4~svn190038.orig/clang/lib/Driver/ToolChains.cpp	2013-09-05 15:34:23.465206439 +0200
-+++ llvm-toolchain-3.3-3.3/clang/lib/Driver/ToolChains.cpp	2013-09-04 14:09:12.000000000 +0000
++++ llvm-toolchain-snapshot_3.4~svn190038/clang/lib/Driver/ToolChains.cpp	2013-09-05 15:37:26.929201769 +0200
-@@ -2588,6 +2588,10 @@
+@@ -2604,6 +2604,12 @@
-   StringRef Version = GCCInstallation.getVersion().Text;
    StringRef TripleStr = GCCInstallation.getTriple().str();
+   const GCCVersion &Version = GCCInstallation.getVersion();
  
-+  #ifdef __i386__
++#ifdef __i386__
-+  // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him
++  // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Helphim
-+  addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.str(), "i386-linux-gnu", GCCInstallation.getMultiarchSuffix(), DriverArgs, CC1Args);
++// For now, comment this patch to make sure it is fixed upstream
-+  #endif
++//  addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.str(), "i386-linux-gnu", GCCInstallation.getMultiarchSuffix(), DriverArgs, CC1Args);
-   if (addLibStdCXXIncludePaths(LibDir.str() + "/../include", 
++#endif
-                                "/c++/" + Version.str(),
++
-                                TripleStr,
+   if (addLibStdCXXIncludePaths(
+           LibDir.str() + "/../include", "/c++/" + Version.Text, TripleStr,
+           GCCInstallation.getBiarchSuffix(), DriverArgs, CC1Args))

debian/patches/lldb-hurd.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-3.3-3.3/lldb/include/lldb/Host/Config.h
+Index: llvm-toolchain-snapshot_3.4~svn190038/lldb/include/lldb/Host/Config.h
 ===================================================================
---- llvm-toolchain-3.3-3.3.orig/lldb/include/lldb/Host/Config.h	2013-08-28 10:29:30.000000000 +0000
+--- llvm-toolchain-snapshot_3.4~svn190038.orig/lldb/include/lldb/Host/Config.h	2013-09-05 15:33:30.817207780 +0200
-+++ llvm-toolchain-3.3-3.3/lldb/include/lldb/Host/Config.h	2013-08-28 17:23:00.000000000 +0000
++++ llvm-toolchain-snapshot_3.4~svn190038/lldb/include/lldb/Host/Config.h	2013-09-05 15:33:30.813207780 +0200
 @@ -14,7 +14,7 @@
  
  #include "lldb/Host/macosx/Config.h"
@@ -11,18 +11,18 @@ Index: llvm-toolchain-3.3-3.3/lldb/include/lldb/Host/Config.h
  
  #include "lldb/Host/linux/Config.h"
  
-Index: llvm-toolchain-3.3-3.3/lldb/source/Host/common/Host.cpp
+Index: llvm-toolchain-snapshot_3.4~svn190038/lldb/source/Host/common/Host.cpp
 ===================================================================
---- llvm-toolchain-3.3-3.3.orig/lldb/source/Host/common/Host.cpp	2013-08-28 10:29:30.000000000 +0000
+--- llvm-toolchain-snapshot_3.4~svn190038.orig/lldb/source/Host/common/Host.cpp	2013-09-05 15:33:30.817207780 +0200
-+++ llvm-toolchain-3.3-3.3/lldb/source/Host/common/Host.cpp	2013-08-28 17:25:38.000000000 +0000
++++ llvm-toolchain-snapshot_3.4~svn190038/lldb/source/Host/common/Host.cpp	2013-09-05 15:34:09.849206788 +0200
-@@ -16,8 +16,10 @@
+@@ -22,8 +22,10 @@
- #include <limits.h>
+ #include <grp.h>
  #include <netdb.h>
  #include <pwd.h>
 +#ifndef __GNU__
  #include <sys/sysctl.h>
- #include <sys/types.h>
+ #endif
 +#endif
- #include <unistd.h>
  
  #if defined (__APPLE__)
+ #include <mach/mach_port.h>

debian/patches/series

@@ -28,5 +28,3 @@ use-deb-json.diff
 libprofile_rt_sparc.patch
 lldb-hurd.diff
 libstdc++-header-i386.diff
-kfreebsd_target_info_clang33.diff
-