refresh of the patches

This commit is contained in:
Sylvestre Ledru 2014-11-29 10:11:29 +00:00
parent 87da0c64bc
commit 710dc439f3
2 changed files with 19 additions and 21 deletions

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.6~svn216901/autoconf/configure.ac Index: llvm-toolchain-snapshot_3.6~svn222952/autoconf/configure.ac
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.6~svn216901.orig/autoconf/configure.ac --- llvm-toolchain-snapshot_3.6~svn222952.orig/autoconf/configure.ac
+++ llvm-toolchain-snapshot_3.6~svn216901/autoconf/configure.ac +++ llvm-toolchain-snapshot_3.6~svn222952/autoconf/configure.ac
@@ -32,12 +32,12 @@ dnl===---------------------------------- @@ -32,12 +32,12 @@ dnl===----------------------------------
dnl Initialize autoconf and define the package name, version number and dnl Initialize autoconf and define the package name, version number and
dnl address for reporting bugs. dnl address for reporting bugs.
@ -17,10 +17,10 @@ Index: llvm-toolchain-snapshot_3.6~svn216901/autoconf/configure.ac
AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API]) AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API])
AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API]) AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API])
Index: llvm-toolchain-snapshot_3.6~svn216901/configure Index: llvm-toolchain-snapshot_3.6~svn222952/configure
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.6~svn216901.orig/configure --- llvm-toolchain-snapshot_3.6~svn222952.orig/configure
+++ llvm-toolchain-snapshot_3.6~svn216901/configure +++ llvm-toolchain-snapshot_3.6~svn222952/configure
@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} @@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='LLVM' PACKAGE_NAME='LLVM'
@ -32,7 +32,7 @@ Index: llvm-toolchain-snapshot_3.6~svn216901/configure
PACKAGE_BUGREPORT='http://llvm.org/bugs/' PACKAGE_BUGREPORT='http://llvm.org/bugs/'
ac_unique_file="lib/IR/Module.cpp" ac_unique_file="lib/IR/Module.cpp"
@@ -1316,7 +1316,7 @@ if test "$ac_init_help" = "long"; then @@ -1314,7 +1314,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
@ -41,7 +41,7 @@ Index: llvm-toolchain-snapshot_3.6~svn216901/configure
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1926,7 +1926,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -1923,7 +1923,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
LLVM_VERSION_MAJOR=3 LLVM_VERSION_MAJOR=3
LLVM_VERSION_MINOR=6 LLVM_VERSION_MINOR=6
LLVM_VERSION_PATCH=0 LLVM_VERSION_PATCH=0

View File

@ -1,17 +1,8 @@
Index: llvm-toolchain-snapshot_3.6~svn216901/polly/lib/Makefile Index: llvm-toolchain-snapshot_3.6~svn222952/polly/lib/Makefile
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.6~svn216901.orig/polly/lib/Makefile --- llvm-toolchain-snapshot_3.6~svn222952.orig/polly/lib/Makefile
+++ llvm-toolchain-snapshot_3.6~svn216901/polly/lib/Makefile +++ llvm-toolchain-snapshot_3.6~svn222952/polly/lib/Makefile
@@ -13,7 +13,7 @@ LOADABLE_MODULE = 1 @@ -33,9 +33,9 @@ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \
CPP.Flags += $(POLLY_INC)
LD.Flags += $(POLLY_LD) $(POLLY_LIB)
-LIBS += $(POLLY_LD) $(POLLY_LIB)
+LIBS += $(POLLY_LD) $(POLLY_LIB) -ljsoncpp
include $(LEVEL)/Makefile.config
@@ -35,9 +35,9 @@ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \
CodeGen/IslExprBuilder.cpp \ CodeGen/IslExprBuilder.cpp \
CodeGen/IslCodeGeneration.cpp CodeGen/IslCodeGeneration.cpp
@ -24,3 +15,10 @@ Index: llvm-toolchain-snapshot_3.6~svn216901/polly/lib/Makefile
SOURCES= Polly.cpp \ SOURCES= Polly.cpp \
Support/GICHelper.cpp \ Support/GICHelper.cpp \
@@ -72,4 +72,5 @@ SOURCES= Polly.cpp \
#
include $(LEVEL)/Makefile.common
-LIBS += $(POLLY_LD) $(POLLY_LIB)
+LIBS += $(POLLY_LD) $(POLLY_LIB) -ljsoncpp
+