From aac74c708381dfb9ffb5d41fc579bcdd9d394d83 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 10 Nov 2018 15:08:07 +0100
Subject: [PATCH] rebase of the patches

---
 debian/patches/clangd-atomic-cmake.patch |  8 ++++----
 debian/patches/reproducible-pch.diff     | 10 +++++-----
 debian/patches/series                    |  6 ------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch
index 9d57934f..6529d56f 100644
--- a/debian/patches/clangd-atomic-cmake.patch
+++ b/debian/patches/clangd-atomic-cmake.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-7-7/clang-tools-extra/clangd/CMakeLists.txt
+Index: llvm-toolchain-snapshot_8~svn346586/clang-tools-extra/clangd/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-7-7.orig/clang-tools-extra/clangd/CMakeLists.txt
-+++ llvm-toolchain-7-7/clang-tools-extra/clangd/CMakeLists.txt
+--- llvm-toolchain-snapshot_8~svn346586.orig/clang-tools-extra/clangd/CMakeLists.txt
++++ llvm-toolchain-snapshot_8~svn346586/clang-tools-extra/clangd/CMakeLists.txt
 @@ -7,6 +7,11 @@ if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
    list(APPEND CLANGD_ATOMIC_LIB "atomic")
  endif()
@@ -13,4 +13,4 @@ Index: llvm-toolchain-7-7/clang-tools-extra/clangd/CMakeLists.txt
 +
  add_clang_library(clangDaemon
    AST.cpp
-   ClangdLSPServer.cpp
+   Cancellation.cpp
diff --git a/debian/patches/reproducible-pch.diff b/debian/patches/reproducible-pch.diff
index bb738866..2a1be1d6 100644
--- a/debian/patches/reproducible-pch.diff
+++ b/debian/patches/reproducible-pch.diff
@@ -4,11 +4,11 @@ Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
 Bug-Debian: https://bugs.debian.org/877359
 Forwarded: no
 
-Index: llvm-toolchain-7-7/clang/lib/Serialization/ASTWriter.cpp
+Index: llvm-toolchain-snapshot_8~svn346586/clang/lib/Serialization/ASTWriter.cpp
 ===================================================================
---- llvm-toolchain-7-7.orig/clang/lib/Serialization/ASTWriter.cpp
-+++ llvm-toolchain-7-7/clang/lib/Serialization/ASTWriter.cpp
-@@ -4293,9 +4293,13 @@ void ASTWriter::WriteOpenCLExtensionType
+--- llvm-toolchain-snapshot_8~svn346586.orig/clang/lib/Serialization/ASTWriter.cpp
++++ llvm-toolchain-snapshot_8~svn346586/clang/lib/Serialization/ASTWriter.cpp
+@@ -4280,9 +4280,13 @@ void ASTWriter::WriteOpenCLExtensionType
      return;
  
    RecordData Record;
@@ -24,7 +24,7 @@ Index: llvm-toolchain-7-7/clang/lib/Serialization/ASTWriter.cpp
      Record.push_back(I.second.size());
      for (auto Ext : I.second)
        AddString(Ext, Record);
-@@ -4308,8 +4312,12 @@ void ASTWriter::WriteOpenCLExtensionDecl
+@@ -4295,8 +4299,12 @@ void ASTWriter::WriteOpenCLExtensionDecl
      return;
  
    RecordData Record;
diff --git a/debian/patches/series b/debian/patches/series
index 43f370d5..c898d1df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -70,18 +70,12 @@ libcxx-silent-failure-arm64.diff
 
 disable-sse2-old-x86.diff
 
-scan-build-clang-X.diff
-0001-analyzer-scan-build-if-status-bugs-is-passed-don-t-f.patch
 bootstrap-fix-include-next.diff
 bootstrap-with-openmp-version-export-missing.diff
 
-hurd-lib_Support_Unix_Path.inc.diff
-hurd-tools_llvm-shlib_CMakeLists.txt.diff
 clangd-atomic-cmake.patch
-rustc-aarch64-test-failure.diff
 symbolizer-path.diff
 remove-apple-clang-manpage.diff
-mips-rdhwr.diff
 clang-arm-default-vfp3-on-armv7a.patch
 reproducible-pch.diff