From d34a88b808b624b55abd0dbfc34aebd185350bfb Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 25 Jun 2014 15:09:06 +0000
Subject: [PATCH] patch applied upstream

---
 debian/changelog                              |  6 ++
 .../patches/debian-mips64-n32-multiarch.diff  | 59 -------------------
 debian/patches/series                         |  1 -
 3 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 debian/patches/debian-mips64-n32-multiarch.diff

diff --git a/debian/changelog b/debian/changelog
index 5be68c3a..cd6c0ef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-snapshot (1:3.5~svn211703-1~exp1) experimental; urgency=medium
+
+  * New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 25 Jun 2014 17:07:03 +0200
+
 llvm-toolchain-snapshot (1:3.5~svn211669-1) unstable; urgency=medium
 
   * New snapshot release
diff --git a/debian/patches/debian-mips64-n32-multiarch.diff b/debian/patches/debian-mips64-n32-multiarch.diff
deleted file mode 100644
index 5d5b9d9f..00000000
--- a/debian/patches/debian-mips64-n32-multiarch.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp
-===================================================================
---- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Driver/ToolChains.cpp	2014-02-19 09:46:39.989351664 +0100
-+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp	2014-02-19 09:46:43.433569829 +0100
-@@ -1322,11 +1322,13 @@
- 
-   static const char *const MIPS64LibDirs[] = { "/lib64", "/lib" };
-   static const char *const MIPS64Triples[] = { "mips64-linux-gnu",
--                                               "mips-mti-linux-gnu" };
-+                                               "mips-mti-linux-gnu",
-+                                               "mips64-linux-gnuabi64" };
-   static const char *const MIPS64ELLibDirs[] = { "/lib64", "/lib" };
-   static const char *const MIPS64ELTriples[] = { "mips64el-linux-gnu",
-                                                  "mips-mti-linux-gnu",
--                                                 "mips64el-linux-android" };
-+                                                 "mips64el-linux-android",
-+                                                 "mips64el-linux-gnuabi64" };
- 
-   static const char *const PPCLibDirs[] = { "/lib32", "/lib" };
-   static const char *const PPCTriples[] = {
-@@ -2767,6 +2769,14 @@
-     if (llvm::sys::fs::exists(SysRoot + "/lib/mipsel-linux-gnu"))
-       return "mipsel-linux-gnu";
-     return TargetTriple.str();
-+  case llvm::Triple::mips64:
-+    if (llvm::sys::fs::exists(SysRoot + "/lib/mips64-linux-gnuabi64"))
-+      return "mips64-linux-gnuabi64";
-+    return TargetTriple.str();
-+  case llvm::Triple::mips64el:
-+    if (llvm::sys::fs::exists(SysRoot + "/lib/mips64el-linux-gnuabi64"))
-+      return "mips64el-linux-gnuabi64";
-+    return TargetTriple.str();
-   case llvm::Triple::ppc:
-     if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc-linux-gnuspe"))
-       return "powerpc-linux-gnuspe";
-@@ -3120,6 +3130,12 @@
-   const StringRef MIPSELMultiarchIncludeDirs[] = {
-     "/usr/include/mipsel-linux-gnu"
-   };
-+  const StringRef MIPS64MultiarchIncludeDirs[] = {
-+    "/usr/include/mips64-linux-gnuabi64"
-+  };
-+  const StringRef MIPS64ELMultiarchIncludeDirs[] = {
-+    "/usr/include/mips64el-linux-gnuabi64"
-+  };
-   const StringRef PPCMultiarchIncludeDirs[] = {
-     "/usr/include/powerpc-linux-gnu"
-   };
-@@ -3142,6 +3158,10 @@
-     MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
-   } else if (getTriple().getArch() == llvm::Triple::mipsel) {
-     MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
-+  } else if (getTriple().getArch() == llvm::Triple::mips64) {
-+    MultiarchIncludeDirs = MIPS64MultiarchIncludeDirs;
-+  } else if (getTriple().getArch() == llvm::Triple::mips64el) {
-+    MultiarchIncludeDirs = MIPS64ELMultiarchIncludeDirs;
-   } else if (getTriple().getArch() == llvm::Triple::ppc) {
-     MultiarchIncludeDirs = PPCMultiarchIncludeDirs;
-   } else if (getTriple().getArch() == llvm::Triple::ppc64) {
diff --git a/debian/patches/series b/debian/patches/series
index 9d8df64f..fcdcc186 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,7 +28,6 @@ removeduplicatedeclaration.diff
 fix-clang-path-and-build.diff
 silent-MCJIIT-tests.diff
 include-target.diff
-debian-mips64-n32-multiarch.diff
 force-gcc-header-obj.diff
 do-not-fail-on-unexpected-pass.diff
 silent-more-tests.diff