refresh of the patches

debian/patches/26-set-correct-float-abi.diff

@@ -18,11 +18,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
-Index: llvm-toolchain-snapshot_5.0~svn296106/clang/lib/Driver/Arch/ARM.cpp
+Index: llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Arch/ARM.cpp
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn296106.orig/clang/lib/Driver/Arch/ARM.cpp
-+++ llvm-toolchain-snapshot_5.0~svn296106/clang/lib/Driver/Arch/ARM.cpp
-@@ -202,7 +202,7 @@ arm::FloatABI arm::getARMFloatABI(const
+--- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
++++ llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+@@ -206,7 +206,7 @@ arm::FloatABI arm::getARMFloatABI(const
        case llvm::Triple::MuslEABI:
        case llvm::Triple::EABI:
          // EABI is always AAPCS, and if it was not marked 'hard', it's softfp

debian/patches/fix-clang-path-and-build.diff

@@ -2,9 +2,11 @@
  clang/lib/Driver/ToolChains.cpp |    2 ++
  1 file changed, 2 insertions(+)
 
---- a/clang/lib/Driver/ToolChains.cpp
-+++ b/clang/lib/Driver/ToolChains.cpp
-@@ -2842,6 +2842,8 @@ void Generic_GCC::AddClangCXXStdlibInclu
+Index: llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Gnu.cpp
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/lib/Driver/ToolChains/Gnu.cpp
++++ llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -2306,6 +2306,8 @@ void Generic_GCC::AddClangCXXStdlibInclu
        DriverArgs.hasArg(options::OPT_nostdincxx))
      return;
  

debian/patches/mips-fpxx-enable.diff

@@ -1,19 +1,17 @@
----
- clang/lib/Driver/Tools.cpp |    5 -----
- 1 file changed, 5 deletions(-)
-
-Index: llvm-toolchain-snapshot_5.0~svn296106/clang/lib/Driver/Arch/Mips.cpp
+Index: llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Arch/Mips.cpp
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn296106.orig/clang/lib/Driver/Arch/Mips.cpp
-+++ llvm-toolchain-snapshot_5.0~svn296106/clang/lib/Driver/Arch/Mips.cpp
-@@ -362,10 +362,6 @@ bool mips::isFP64ADefault(const llvm::Tr
+--- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp
++++ llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+@@ -368,10 +368,10 @@ bool mips::isFP64ADefault(const llvm::Tr
  
  bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName,
                           StringRef ABIName, mips::FloatABI FloatABI) {
 -  if (Triple.getVendor() != llvm::Triple::ImaginationTechnologies &&
--      Triple.getVendor() != llvm::Triple::MipsTechnologies &&
--      !Triple.isAndroid())
++/*  if (Triple.getVendor() != llvm::Triple::ImaginationTechnologies &&
+       Triple.getVendor() != llvm::Triple::MipsTechnologies &&
+       !Triple.isAndroid())
 -    return false;
++    return false;*/
  
    if (ABIName != "32")
      return false;

debian/patches/scan-view-fix-path.diff

@@ -1,7 +1,9 @@
---- llvm-toolchain-snapshot_3.8~svn253186.orig/clang/tools/scan-view/bin/scan-view.old    2016-05-23 15:27:03.278422015 +0200
-+++ llvm-toolchain-snapshot_3.8~svn253186/clang/tools/scan-view/bin/scan-view        2016-05-23 15:34:30.517953399 +0200
-@@ -61,7 +61,7 @@
-
+Index: llvm-toolchain-snapshot_5.0~svn297449/clang/tools/scan-view/bin/scan-view
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_5.0~svn297449/clang/tools/scan-view/bin/scan-view
+@@ -61,7 +61,7 @@ def start_browser(port, options):
+ 
  def run(port, options, root):
      # Prefer to look relative to the installed binary
 -    share = os.path.dirname(__file__) + "/../share/scan-view"

debian/patches/use-deb-json.diff

@@ -3,10 +3,10 @@
  polly/lib/CMakeLists.txt |   14 +++++++-------
  2 files changed, 11 insertions(+), 8 deletions(-)
 
-Index: llvm-toolchain-snapshot_5.0~svn296391/polly/CMakeLists.txt
+Index: llvm-toolchain-snapshot_5.0~svn297449/polly/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn296391.orig/polly/CMakeLists.txt
-+++ llvm-toolchain-snapshot_5.0~svn296391/polly/CMakeLists.txt
+--- llvm-toolchain-snapshot_5.0~svn297449.orig/polly/CMakeLists.txt
++++ llvm-toolchain-snapshot_5.0~svn297449/polly/CMakeLists.txt
 @@ -171,11 +171,13 @@ else()
    set(ISL_TARGET PollyISL)
  endif()
@@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_5.0~svn296391/polly/CMakeLists.txt
    ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/pet/include
    ${CMAKE_CURRENT_SOURCE_DIR}/lib/External
    ${CMAKE_CURRENT_BINARY_DIR}/include
-Index: llvm-toolchain-snapshot_5.0~svn296391/polly/lib/CMakeLists.txt
+Index: llvm-toolchain-snapshot_5.0~svn297449/polly/lib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn296391.orig/polly/lib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_5.0~svn296391/polly/lib/CMakeLists.txt
+--- llvm-toolchain-snapshot_5.0~svn297449.orig/polly/lib/CMakeLists.txt
++++ llvm-toolchain-snapshot_5.0~svn297449/polly/lib/CMakeLists.txt
 @@ -1,10 +1,10 @@
  set(LLVM_NO_RTTI 1)
  
@@ -42,16 +42,16 @@ Index: llvm-toolchain-snapshot_5.0~svn296391/polly/lib/CMakeLists.txt
  
  set(ISL_CODEGEN_FILES
      CodeGen/IslAst.cpp
-@@ -51,7 +51,7 @@ add_polly_library(Polly
-   Support/ScopHelper.cpp
+@@ -52,7 +52,7 @@ add_polly_library(Polly
    Support/ScopLocation.cpp
    Support/ISLTools.cpp
+   Support/DumpModulePass.cpp
 -  ${POLLY_JSON_FILES}
 +#  ${POLLY_JSON_FILES}
    Transform/Canonicalization.cpp
    Transform/CodePreparation.cpp
    Transform/DeadCodeElimination.cpp
-@@ -66,7 +66,7 @@ if (GPU_CODEGEN)
+@@ -67,7 +67,7 @@ if (GPU_CODEGEN)
    target_link_libraries(Polly PollyPPCG)
  endif (GPU_CODEGEN)
  
@@ -60,10 +60,10 @@ Index: llvm-toolchain-snapshot_5.0~svn296391/polly/lib/CMakeLists.txt
  
  if (BUILD_SHARED_LIBS)
    target_link_libraries(Polly
-Index: llvm-toolchain-snapshot_5.0~svn296391/polly/lib/Exchange/JSONExporter.cpp
+Index: llvm-toolchain-snapshot_5.0~svn297449/polly/lib/Exchange/JSONExporter.cpp
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn296391.orig/polly/lib/Exchange/JSONExporter.cpp
-+++ llvm-toolchain-snapshot_5.0~svn296391/polly/lib/Exchange/JSONExporter.cpp
+--- llvm-toolchain-snapshot_5.0~svn297449.orig/polly/lib/Exchange/JSONExporter.cpp
++++ llvm-toolchain-snapshot_5.0~svn297449/polly/lib/Exchange/JSONExporter.cpp
 @@ -29,8 +29,8 @@
  #include "isl/printer.h"
  #include "isl/set.h"