Rebase bug783205.patch

debian/changelog

@@ -6,8 +6,9 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium
   * Fix many lintian warning/errors
     - copyright fixes
     - updated overrides for v5 switch
-    - control files
+    - d/control fixes on VCS fields and multiarch.
     - disabled ocaml documentation
+  * d/p/bug783205.patch: rebase to 3.7.
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Aug 2015 09:02:30 +0200
 

debian/patches/bug783205.patch

@@ -1,47 +0,0 @@
-From: Steven Chamberlain <steven@pyro.eu.org>
-Date: Sun, 10 May 2015 19:46:59 +0100
-Subject: support Debian s390x multiarch paths
-
---- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/ToolChains.cpp
-+++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/ToolChains.cpp
-@@ -3081,6 +3081,10 @@ static std::string getMultiarchTriple(co
-     if (llvm::sys::fs::exists(SysRoot + "/lib/sparc64-linux-gnu"))
-       return "sparc64-linux-gnu";
-     break;
-+  case llvm::Triple::systemz:
-+    if (llvm::sys::fs::exists(SysRoot + "/lib/s390x-linux-gnu"))
-+      return "s390x-linux-gnu";
-+    break;
-   }
-   return TargetTriple.str();
- }
-@@ -3424,6 +3428,8 @@ void Linux::AddClangSystemIncludeArgs(co
-       "/usr/include/sparc-linux-gnu"};
-   const StringRef Sparc64MultiarchIncludeDirs[] = {
-       "/usr/include/sparc64-linux-gnu"};
-+  const StringRef SYSTEMZMultiarchIncludeDirs[] = {
-+      "/usr/include/s390x-linux-gnu"};
-   ArrayRef<StringRef> MultiarchIncludeDirs;
-   switch (getTriple().getArch()) {
-   case llvm::Triple::x86_64:
-@@ -3469,6 +3475,9 @@ void Linux::AddClangSystemIncludeArgs(co
-   case llvm::Triple::sparcv9:
-     MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs;
-     break;
-+  case llvm::Triple::systemz:
-+    MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs;
-+    break;
-   default:
-     break;
-   }
---- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/Tools.cpp
-+++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/Tools.cpp
-@@ -8008,7 +8008,7 @@ static std::string getLinuxDynamicLinker
-       return "/lib64/ld64.so.1";
-     return "/lib64/ld64.so.2";
-   } else if (Arch == llvm::Triple::systemz)
--    return "/lib64/ld64.so.1";
-+    return "/lib/ld64.so.1";
-   else if (Arch == llvm::Triple::sparcv9)
-     return "/lib64/ld-linux.so.2";
-   else if (Arch == llvm::Triple::x86_64 &&

debian/patches/series

@@ -38,6 +38,7 @@ lldb-libname.diff
 lit-lang.diff
 compiler-rt-i586.diff
 clang-analyzer-force-version.diff
-
+#bug783205.patch
 locale-issue-ld.diff
 CVE-2015-2305.patch
+bug783205.patch