From e73cc836c4cb0217f08d656a48e55bb97dabc139 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 9 Feb 2019 16:55:18 +0100
Subject: [PATCH] rebase of the patch

---
 debian/patches/D52340-rustc-debuginfo.diff | 14 ++++----
 debian/patches/hurd-pathmax.diff           | 42 +++++++++++-----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/debian/patches/D52340-rustc-debuginfo.diff b/debian/patches/D52340-rustc-debuginfo.diff
index a9e9a33b..9a24acac 100644
--- a/debian/patches/D52340-rustc-debuginfo.diff
+++ b/debian/patches/D52340-rustc-debuginfo.diff
@@ -1,8 +1,8 @@
-Index: llvm/lib/Bitcode/Reader/MetadataLoader.cpp
+Index: llvm-toolchain-7_7.0.1~svn352582/lib/Bitcode/Reader/MetadataLoader.cpp
 ===================================================================
---- llvm.orig/lib/Bitcode/Reader/MetadataLoader.cpp
-+++ llvm/lib/Bitcode/Reader/MetadataLoader.cpp
-@@ -1313,7 +1313,7 @@
+--- llvm-toolchain-7_7.0.1~svn352582.orig/lib/Bitcode/Reader/MetadataLoader.cpp
++++ llvm-toolchain-7_7.0.1~svn352582/lib/Bitcode/Reader/MetadataLoader.cpp
+@@ -1308,7 +1308,7 @@ Error MetadataLoader::MetadataLoaderImpl
                             (Context, Tag, Name, File, Line, Scope, BaseType,
                              SizeInBits, AlignInBits, OffsetInBits, Flags,
                              Elements, RuntimeLang, VTableHolder, TemplateParams,
@@ -11,10 +11,10 @@ Index: llvm/lib/Bitcode/Reader/MetadataLoader.cpp
      if (!IsNotUsedInTypeRef && Identifier)
        MetadataList.addTypeRef(*Identifier, *cast<DICompositeType>(CT));
  
-Index: llvm/test/Assembler/debug-variant-discriminator.ll
+Index: llvm-toolchain-7_7.0.1~svn352582/test/Assembler/debug-variant-discriminator.ll
 ===================================================================
---- llvm.orig/test/Assembler/debug-variant-discriminator.ll
-+++ llvm/test/Assembler/debug-variant-discriminator.ll
+--- /dev/null
++++ llvm-toolchain-7_7.0.1~svn352582/test/Assembler/debug-variant-discriminator.ll
 @@ -0,0 +1,14 @@
 +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s
 +; RUN: verify-uselistorder %s
diff --git a/debian/patches/hurd-pathmax.diff b/debian/patches/hurd-pathmax.diff
index d68cd4c1..fcf72b75 100644
--- a/debian/patches/hurd-pathmax.diff
+++ b/debian/patches/hurd-pathmax.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_6.0~svn317126/clang/lib/Basic/FileManager.cpp
+Index: llvm-toolchain-7_7.1.0~svn353565/clang/lib/Basic/FileManager.cpp
 ===================================================================
---- llvm-toolchain-snapshot_6.0~svn317126.orig/clang/lib/Basic/FileManager.cpp
-+++ llvm-toolchain-snapshot_6.0~svn317126/clang/lib/Basic/FileManager.cpp
+--- llvm-toolchain-7_7.1.0~svn353565.orig/clang/lib/Basic/FileManager.cpp
++++ llvm-toolchain-7_7.1.0~svn353565/clang/lib/Basic/FileManager.cpp
 @@ -501,6 +501,12 @@ void FileManager::invalidateCache(const
    UniqueRealFiles.erase(Entry->getUniqueID());
  }
@@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_6.0~svn317126/clang/lib/Basic/FileManager.cpp
  void FileManager::GetUniqueIDMapping(
                     SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
    UIDToFiles.clear();
-Index: llvm-toolchain-snapshot_6.0~svn317126/lldb/include/lldb/lldb-defines.h
+Index: llvm-toolchain-7_7.1.0~svn353565/lldb/include/lldb/lldb-defines.h
 ===================================================================
---- llvm-toolchain-snapshot_6.0~svn317126.orig/lldb/include/lldb/lldb-defines.h
-+++ llvm-toolchain-snapshot_6.0~svn317126/lldb/include/lldb/lldb-defines.h
+--- llvm-toolchain-7_7.1.0~svn353565.orig/lldb/include/lldb/lldb-defines.h
++++ llvm-toolchain-7_7.1.0~svn353565/lldb/include/lldb/lldb-defines.h
 @@ -28,6 +28,11 @@
  #define INT32_MAX 2147483647
  #endif
@@ -31,11 +31,11 @@ Index: llvm-toolchain-snapshot_6.0~svn317126/lldb/include/lldb/lldb-defines.h
  #if !defined(UINT32_MAX)
  #define UINT32_MAX 4294967295U
  #endif
-Index: llvm-toolchain-snapshot_6.0~svn317126/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-7_7.1.0~svn353565/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-snapshot_6.0~svn317126.orig/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_6.0~svn317126/lib/Support/Unix/Path.inc
-@@ -64,6 +64,7 @@
+--- llvm-toolchain-7_7.1.0~svn353565.orig/lib/Support/Unix/Path.inc
++++ llvm-toolchain-7_7.1.0~svn353565/lib/Support/Unix/Path.inc
+@@ -49,6 +49,7 @@
  // For GNU Hurd
  #if defined(__GNU__) && !defined(PATH_MAX)
  # define PATH_MAX 4096
@@ -43,11 +43,11 @@ Index: llvm-toolchain-snapshot_6.0~svn317126/lib/Support/Unix/Path.inc
  #endif
  
  #include <sys/types.h>
-Index: llvm-toolchain-snapshot_6.0~svn317126/tools/dsymutil/DwarfLinker.cpp
+Index: llvm-toolchain-7_7.1.0~svn353565/tools/dsymutil/DwarfLinker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_6.0~svn317126.orig/tools/dsymutil/DwarfLinker.cpp
-+++ llvm-toolchain-snapshot_6.0~svn317126/tools/dsymutil/DwarfLinker.cpp
-@@ -93,6 +93,11 @@
+--- llvm-toolchain-7_7.1.0~svn353565.orig/tools/dsymutil/DwarfLinker.cpp
++++ llvm-toolchain-7_7.1.0~svn353565/tools/dsymutil/DwarfLinker.cpp
+@@ -101,6 +101,11 @@
  #include <utility>
  #include <vector>
  
@@ -59,10 +59,10 @@ Index: llvm-toolchain-snapshot_6.0~svn317126/tools/dsymutil/DwarfLinker.cpp
  namespace llvm {
  namespace dsymutil {
  
-Index: llvm-toolchain-snapshot_6.0~svn317126/polly/lib/External/ppcg/cuda_common.c
+Index: llvm-toolchain-7_7.1.0~svn353565/polly/lib/External/ppcg/cuda_common.c
 ===================================================================
---- llvm-toolchain-snapshot_6.0~svn317126.orig/polly/lib/External/ppcg/cuda_common.c
-+++ llvm-toolchain-snapshot_6.0~svn317126/polly/lib/External/ppcg/cuda_common.c
+--- llvm-toolchain-7_7.1.0~svn353565.orig/polly/lib/External/ppcg/cuda_common.c
++++ llvm-toolchain-7_7.1.0~svn353565/polly/lib/External/ppcg/cuda_common.c
 @@ -15,6 +15,11 @@
  #include "cuda_common.h"
  #include "ppcg.h"
@@ -75,11 +75,11 @@ Index: llvm-toolchain-snapshot_6.0~svn317126/polly/lib/External/ppcg/cuda_common
  /* Open the host .cu file and the kernel .hu and .cu files for writing.
   * Add the necessary includes.
   */
-Index: llvm-toolchain-6.0-6.0.1/clang/lib/Frontend/ModuleDependencyCollector.cpp
+Index: llvm-toolchain-7_7.1.0~svn353565/clang/lib/Frontend/ModuleDependencyCollector.cpp
 ===================================================================
---- llvm-toolchain-6.0-6.0.1.orig/clang/lib/Frontend/ModuleDependencyCollector.cpp
-+++ llvm-toolchain-6.0-6.0.1/clang/lib/Frontend/ModuleDependencyCollector.cpp
-@@ -97,6 +97,11 @@ struct ModuleDependencyMMCallbacks : pub
+--- llvm-toolchain-7_7.1.0~svn353565.orig/clang/lib/Frontend/ModuleDependencyCollector.cpp
++++ llvm-toolchain-7_7.1.0~svn353565/clang/lib/Frontend/ModuleDependencyCollector.cpp
+@@ -99,6 +99,11 @@ struct ModuleDependencyMMCallbacks : pub
  
  }