proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 11:41:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

patches rebased

Browse Source
This commit is contained in:
Sylvestre Ledru 2017-04-28 09:10:13 +00:00
parent 29a36b1cc4
commit 97af9bff60
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/patches/27-fix_clang_stdint.diff vendored
View File

@ -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_5.0~svn301630.orig/clang/lib/Headers/stdint.h
+++ llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Headers/stdint.h +++ llvm-toolchain-snapshot_5.0~svn301630/clang/lib/Headers/stdint.h
@@ -22,8 +22,6 @@ @@ -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.1 Exact-width integer types.
* C99 7.18.1.2 Minimum-width integer types. * C99 7.18.1.2 Minimum-width integer types.
@@ -703,5 +703,5 @@ typedef __UINTMAX_TYPE__ uintmax_t; @@ -700,5 +700,5 @@ typedef __UINTMAX_TYPE__ uintmax_t;
#define INTMAX_C(v) __INTN_C(__INTMAX_WIDTH__, v) #define INTMAX_C(v) __int_c(v, __INTMAX_C_SUFFIX__)
#define UINTMAX_C(v) __UINTN_C(__INTMAX_WIDTH__, v) #define UINTMAX_C(v) __int_c(v, __UINTMAX_C_SUFFIX__)
-#endif /* __STDC_HOSTED__ */ -#endif /* __STDC_HOSTED__ */
#endif /* __CLANG_STDINT_H */ #endif /* __CLANG_STDINT_H */

37
debian/patches/use-deb-json.diff vendored
View File

@ -3,11 +3,11 @@
polly/lib/CMakeLists.txt | 14 +++++++------- polly/lib/CMakeLists.txt | 14 +++++++-------
2 files changed, 11 insertions(+), 8 deletions(-) 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~svn301630.orig/polly/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn297449/polly/CMakeLists.txt +++ llvm-toolchain-snapshot_5.0~svn301630/polly/CMakeLists.txt
@@ -171,11 +171,13 @@ else() @@ -179,11 +179,13 @@ else()
set(ISL_TARGET PollyISL) set(ISL_TARGET PollyISL)
endif() 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/pet/include
${CMAKE_CURRENT_SOURCE_DIR}/lib/External ${CMAKE_CURRENT_SOURCE_DIR}/lib/External
${CMAKE_CURRENT_BINARY_DIR}/include ${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~svn301630.orig/polly/lib/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn297449/polly/lib/CMakeLists.txt +++ llvm-toolchain-snapshot_5.0~svn301630/polly/lib/CMakeLists.txt
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
set(LLVM_NO_RTTI 1) set(LLVM_NO_RTTI 1)
@ -42,7 +42,7 @@ Index: llvm-toolchain-snapshot_5.0~svn297449/polly/lib/CMakeLists.txt
set(ISL_CODEGEN_FILES set(ISL_CODEGEN_FILES
CodeGen/IslAst.cpp CodeGen/IslAst.cpp
@@ -52,7 +52,7 @@ add_polly_library(Polly @@ -56,7 +56,7 @@ add_library(PollyCore OBJECT
Support/ScopLocation.cpp Support/ScopLocation.cpp
Support/ISLTools.cpp Support/ISLTools.cpp
Support/DumpModulePass.cpp Support/DumpModulePass.cpp
@ -51,19 +51,18 @@ Index: llvm-toolchain-snapshot_5.0~svn297449/polly/lib/CMakeLists.txt
Transform/Canonicalization.cpp Transform/Canonicalization.cpp
Transform/CodePreparation.cpp Transform/CodePreparation.cpp
Transform/DeadCodeElimination.cpp Transform/DeadCodeElimination.cpp
@@ -67,7 +67,7 @@ if (GPU_CODEGEN) @@ -75,6 +75,7 @@ add_library(PollyCore OBJECT
target_link_libraries(Polly PollyPPCG) add_polly_library(Polly $<TARGET_OBJECTS:PollyCore>)
endif (GPU_CODEGEN)
-target_link_libraries(Polly ${ISL_TARGET})
+target_link_libraries(Polly ${ISL_TARGET} jsoncpp)
if (BUILD_SHARED_LIBS)
target_link_libraries(Polly target_link_libraries(Polly
Index: llvm-toolchain-snapshot_5.0~svn297449/polly/lib/Exchange/JSONExporter.cpp ${ISL_TARGET}
+ jsoncpp
)
# 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~svn301630.orig/polly/lib/Exchange/JSONExporter.cpp
+++ llvm-toolchain-snapshot_5.0~svn297449/polly/lib/Exchange/JSONExporter.cpp +++ llvm-toolchain-snapshot_5.0~svn301630/polly/lib/Exchange/JSONExporter.cpp
@@ -29,8 +29,8 @@ @@ -29,8 +29,8 @@
#include "isl/printer.h" #include "isl/printer.h"
#include "isl/set.h" #include "isl/set.h"