refresh of the pach

This commit is contained in:
Sylvestre Ledru 2015-07-15 16:08:00 +00:00
parent cf0691f3dd
commit d410653914
4 changed files with 27 additions and 38 deletions

View File

@ -1,11 +1,11 @@
# Force the version of clang in the analyzer # Force the version of clang in the analyzer
# This was causing the static analyzer to fail silently if the clang & clang++ are # This was causing the static analyzer to fail silently if the clang & clang++ are
# not installed # not installed
Index: llvm-toolchain-snapshot_3.7~svn238736/clang/tools/scan-build/ccc-analyzer Index: llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn238736.orig/clang/tools/scan-build/ccc-analyzer --- llvm-toolchain-snapshot_3.7~svn242297.orig/clang/tools/scan-build/ccc-analyzer
+++ llvm-toolchain-snapshot_3.7~svn238736/clang/tools/scan-build/ccc-analyzer +++ llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer
@@ -63,7 +63,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/ @@ -90,7 +90,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
$Clang = $ENV{'CLANG_CXX'}; $Clang = $ENV{'CLANG_CXX'};
@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_3.7~svn238736/clang/tools/scan-build/ccc-analyzer
$IsCXX = 1 $IsCXX = 1
} }
@@ -72,7 +72,7 @@ else { @@ -99,7 +99,7 @@ else {
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; } if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; }
$Clang = $ENV{'CLANG'}; $Clang = $ENV{'CLANG'};

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.7~svn229829/compiler-rt/make/platform/clang_linux.mk Index: llvm-toolchain-snapshot_3.7~svn242297/compiler-rt/make/platform/clang_linux.mk
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn229829.orig/compiler-rt/make/platform/clang_linux.mk --- llvm-toolchain-snapshot_3.7~svn242297.orig/compiler-rt/make/platform/clang_linux.mk
+++ llvm-toolchain-snapshot_3.7~svn229829/compiler-rt/make/platform/clang_linux.mk +++ llvm-toolchain-snapshot_3.7~svn242297/compiler-rt/make/platform/clang_linux.mk
@@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa @@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa
# Define configs only if arch in triple is i386 or x86_64 # Define configs only if arch in triple is i386 or x86_64
@ -20,11 +20,11 @@ Index: llvm-toolchain-snapshot_3.7~svn229829/compiler-rt/make/platform/clang_lin
SupportedArches := i386 SupportedArches := i386
ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0) ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0)
SupportedArches += x86_64 SupportedArches += x86_64
Index: llvm-toolchain-snapshot_3.7~svn229829/clang/runtime/compiler-rt/Makefile Index: llvm-toolchain-snapshot_3.7~svn242297/clang/runtime/compiler-rt/Makefile
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn229829.orig/clang/runtime/compiler-rt/Makefile --- llvm-toolchain-snapshot_3.7~svn242297.orig/clang/runtime/compiler-rt/Makefile
+++ llvm-toolchain-snapshot_3.7~svn229829/clang/runtime/compiler-rt/Makefile +++ llvm-toolchain-snapshot_3.7~svn242297/clang/runtime/compiler-rt/Makefile
@@ -158,6 +158,7 @@ BuildRuntimeLibraries: @@ -159,6 +159,7 @@ BuildRuntimeLibraries:
ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \ ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
ProjObjRoot=$(PROJ_OBJ_DIR) \ ProjObjRoot=$(PROJ_OBJ_DIR) \
CC="$(ToolDir)/clang" \ CC="$(ToolDir)/clang" \

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.7~svn229332/test/lit.cfg Index: llvm-toolchain-snapshot_3.7~svn242297/test/lit.cfg
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn229332.orig/test/lit.cfg --- llvm-toolchain-snapshot_3.7~svn242297.orig/test/lit.cfg
+++ llvm-toolchain-snapshot_3.7~svn229332/test/lit.cfg +++ llvm-toolchain-snapshot_3.7~svn242297/test/lit.cfg
@@ -334,7 +334,7 @@ def have_ld_plugin_support(): @@ -345,7 +345,7 @@ def have_ld_plugin_support():
if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')): if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')):
return False return False

View File

@ -1,40 +1,29 @@
Index: llvm-toolchain-snapshot_3.7~svn226019/autoconf/configure.ac Index: llvm-toolchain-snapshot_3.7~svn242297/autoconf/configure.ac
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn226019.orig/autoconf/configure.ac --- llvm-toolchain-snapshot_3.7~svn242297.orig/autoconf/configure.ac
+++ llvm-toolchain-snapshot_3.7~svn226019/autoconf/configure.ac +++ llvm-toolchain-snapshot_3.7~svn242297/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.
-AC_INIT([LLVM],[3.7.0svn],[http://llvm.org/bugs/]) -AC_INIT([LLVM],[3.8.0svn],[http://llvm.org/bugs/])
+AC_INIT([LLVM],[3.7.0],[http://llvm.org/bugs/]) +AC_INIT([LLVM],[3.8.0],[http://llvm.org/bugs/])
LLVM_VERSION_MAJOR=3 LLVM_VERSION_MAJOR=3
LLVM_VERSION_MINOR=7 LLVM_VERSION_MINOR=8
LLVM_VERSION_PATCH=0 LLVM_VERSION_PATCH=0
-LLVM_VERSION_SUFFIX=svn -LLVM_VERSION_SUFFIX=svn
+LLVM_VERSION_SUFFIX= +LLVM_VERSION_SUFFIX=
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.7~svn226019/configure Index: llvm-toolchain-snapshot_3.7~svn242297/configure
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn226019.orig/configure --- llvm-toolchain-snapshot_3.7~svn242297.orig/configure
+++ llvm-toolchain-snapshot_3.7~svn226019/configure +++ llvm-toolchain-snapshot_3.7~svn242297/configure
@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} @@ -1956,7 +1956,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Identity of this package.
PACKAGE_NAME='LLVM'
PACKAGE_TARNAME='llvm'
-PACKAGE_VERSION='3.7.0svn'
-PACKAGE_STRING='LLVM 3.7.0svn'
+PACKAGE_VERSION='3.7.0'
+PACKAGE_STRING='LLVM 3.7.0'
PACKAGE_BUGREPORT='http://llvm.org/bugs/'
ac_unique_file="lib/IR/Module.cpp"
@@ -1923,7 +1923,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
LLVM_VERSION_MAJOR=3 LLVM_VERSION_MAJOR=3
LLVM_VERSION_MINOR=7 LLVM_VERSION_MINOR=8
LLVM_VERSION_PATCH=0 LLVM_VERSION_PATCH=0
-LLVM_VERSION_SUFFIX=svn -LLVM_VERSION_SUFFIX=svn
+LLVM_VERSION_SUFFIX= +LLVM_VERSION_SUFFIX=