From 97af9bff60be4ca24b4644af1272cd685b8daee8 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 28 Apr 2017 09:10:13 +0000
Subject: [PATCH] patches rebased

---
 debian/patches/27-fix_clang_stdint.diff | 12 ++++----
 debian/patches/use-deb-json.diff        | 37 ++++++++++++-------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/debian/patches/27-fix_clang_stdint.diff b/debian/patches/27-fix_clang_stdint.diff
index 6cb67802..f1c751fa 100644
--- a/debian/patches/27-fix_clang_stdint.diff
+++ b/debian/patches/27-fix_clang_stdint.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Headers/stdint.h
+Index: llvm-toolchain-snapshot_5.0~svn301630/clang/lib/Headers/stdint.h
 ===================================================================
---- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/lib/Headers/stdint.h
-+++ llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Headers/stdint.h
+--- llvm-toolchain-snapshot_5.0~svn301630.orig/clang/lib/Headers/stdint.h
++++ llvm-toolchain-snapshot_5.0~svn301630/clang/lib/Headers/stdint.h
 @@ -22,8 +22,6 @@
   *
  \*===----------------------------------------------------------------------===*/
@@ -20,9 +20,9 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Headers/stdint.h
  
  /* C99 7.18.1.1 Exact-width integer types.
   * C99 7.18.1.2 Minimum-width integer types.
-@@ -703,5 +703,5 @@ typedef __UINTMAX_TYPE__ uintmax_t;
- #define INTMAX_C(v)   __INTN_C(__INTMAX_WIDTH__, v)
- #define UINTMAX_C(v) __UINTN_C(__INTMAX_WIDTH__, v)
+@@ -700,5 +700,5 @@ typedef __UINTMAX_TYPE__ uintmax_t;
+ #define  INTMAX_C(v) __int_c(v,  __INTMAX_C_SUFFIX__)
+ #define UINTMAX_C(v) __int_c(v, __UINTMAX_C_SUFFIX__)
  
 -#endif /* __STDC_HOSTED__ */
  #endif /* __CLANG_STDINT_H */
diff --git a/debian/patches/use-deb-json.diff b/debian/patches/use-deb-json.diff
index 43438bac..3a10d6fe 100644
--- a/debian/patches/use-deb-json.diff
+++ b/debian/patches/use-deb-json.diff
@@ -3,11 +3,11 @@
  polly/lib/CMakeLists.txt |   14 +++++++-------
  2 files changed, 11 insertions(+), 8 deletions(-)
 
-Index: llvm-toolchain-snapshot_5.0~svn297449/polly/CMakeLists.txt
+Index: llvm-toolchain-snapshot_5.0~svn301630/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()
+--- llvm-toolchain-snapshot_5.0~svn301630.orig/polly/CMakeLists.txt
++++ llvm-toolchain-snapshot_5.0~svn301630/polly/CMakeLists.txt
+@@ -179,11 +179,13 @@ else()
    set(ISL_TARGET PollyISL)
  endif()
  
@@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_5.0~svn297449/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~svn297449/polly/lib/CMakeLists.txt
+Index: llvm-toolchain-snapshot_5.0~svn301630/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
+--- llvm-toolchain-snapshot_5.0~svn301630.orig/polly/lib/CMakeLists.txt
++++ llvm-toolchain-snapshot_5.0~svn301630/polly/lib/CMakeLists.txt
 @@ -1,10 +1,10 @@
  set(LLVM_NO_RTTI 1)
  
@@ -42,7 +42,7 @@ Index: llvm-toolchain-snapshot_5.0~svn297449/polly/lib/CMakeLists.txt
  
  set(ISL_CODEGEN_FILES
      CodeGen/IslAst.cpp
-@@ -52,7 +52,7 @@ add_polly_library(Polly
+@@ -56,7 +56,7 @@ add_library(PollyCore OBJECT
    Support/ScopLocation.cpp
    Support/ISLTools.cpp
    Support/DumpModulePass.cpp
@@ -51,19 +51,18 @@ Index: llvm-toolchain-snapshot_5.0~svn297449/polly/lib/CMakeLists.txt
    Transform/Canonicalization.cpp
    Transform/CodePreparation.cpp
    Transform/DeadCodeElimination.cpp
-@@ -67,7 +67,7 @@ if (GPU_CODEGEN)
-   target_link_libraries(Polly PollyPPCG)
- endif (GPU_CODEGEN)
+@@ -75,6 +75,7 @@ add_library(PollyCore OBJECT
+ add_polly_library(Polly $<TARGET_OBJECTS:PollyCore>)
+ target_link_libraries(Polly
+   ${ISL_TARGET}
++  jsoncpp
+ )
  
--target_link_libraries(Polly ${ISL_TARGET})
-+target_link_libraries(Polly ${ISL_TARGET} jsoncpp)
- 
- if (BUILD_SHARED_LIBS)
-   target_link_libraries(Polly
-Index: llvm-toolchain-snapshot_5.0~svn297449/polly/lib/Exchange/JSONExporter.cpp
+ # Additional dependencies for Polly-ACC.
+Index: llvm-toolchain-snapshot_5.0~svn301630/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
+--- llvm-toolchain-snapshot_5.0~svn301630.orig/polly/lib/Exchange/JSONExporter.cpp
++++ llvm-toolchain-snapshot_5.0~svn301630/polly/lib/Exchange/JSONExporter.cpp
 @@ -29,8 +29,8 @@
  #include "isl/printer.h"
  #include "isl/set.h"