refresh of the patches

This commit is contained in:
Sylvestre Ledru 2014-03-04 13:56:29 +00:00
parent 5b90f27933
commit 0511b70434
2 changed files with 27 additions and 27 deletions

View File

@ -1,28 +1,28 @@
Index: llvm-toolchain-snapshot_3.5~svn201068/autoconf/configure.ac Index: llvm-toolchain-snapshot_3.5~svn202847/autoconf/configure.ac
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn201068.orig/autoconf/configure.ac 2014-02-10 09:12:31.462814967 +0100 --- llvm-toolchain-snapshot_3.5~svn202847.orig/autoconf/configure.ac 2014-03-04 14:43:34.430731503 +0100
+++ llvm-toolchain-snapshot_3.5~svn201068/autoconf/configure.ac 2014-02-10 09:12:49.866814516 +0100 +++ llvm-toolchain-snapshot_3.5~svn202847/autoconf/configure.ac 2014-03-04 14:43:53.702730643 +0100
@@ -31,7 +31,7 @@ @@ -32,7 +32,7 @@
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.5svn],[http://llvm.org/bugs/])
+AC_INIT([LLVM],[3.5],[http://llvm.org/bugs/])
LLVM_DEFINE_SUBST([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API])
LLVM_DEFINE_SUBST([LLVM_VERSION_MINOR], [5], [Minor version of the LLVM API])
Index: llvm-toolchain-snapshot_3.5~svn201068/configure -AC_INIT([LLVM],[3.5.0svn],[http://llvm.org/bugs/])
+AC_INIT([LLVM],[3.5.0],[http://llvm.org/bugs/])
LLVM_VERSION_MAJOR=3
LLVM_VERSION_MINOR=5
Index: llvm-toolchain-snapshot_3.5~svn202847/configure
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn201068.orig/configure 2014-02-10 09:12:31.462814967 +0100 --- llvm-toolchain-snapshot_3.5~svn202847.orig/configure 2014-03-04 14:43:34.430731503 +0100
+++ llvm-toolchain-snapshot_3.5~svn201068/configure 2014-02-10 09:12:31.462814967 +0100 +++ llvm-toolchain-snapshot_3.5~svn202847/configure 2014-03-04 14:44:24.942729247 +0100
@@ -561,8 +561,8 @@ @@ -561,8 +561,8 @@
# Identity of this package. # Identity of this package.
PACKAGE_NAME='LLVM' PACKAGE_NAME='LLVM'
PACKAGE_TARNAME='llvm' PACKAGE_TARNAME='llvm'
-PACKAGE_VERSION='3.5svn' -PACKAGE_VERSION='3.5.0svn'
-PACKAGE_STRING='LLVM 3.5svn' -PACKAGE_STRING='LLVM 3.5.0svn'
+PACKAGE_VERSION='3.5' +PACKAGE_VERSION='3.5.0'
+PACKAGE_STRING='LLVM 3.5' +PACKAGE_STRING='LLVM 3.5.0'
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"

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.5~svn202473/clang/lib/Basic/FileManager.cpp Index: llvm-toolchain-snapshot_3.5~svn202847/clang/lib/Basic/FileManager.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn202473.orig/clang/lib/Basic/FileManager.cpp 2014-02-28 09:56:58.459328014 +0100 --- llvm-toolchain-snapshot_3.5~svn202847.orig/clang/lib/Basic/FileManager.cpp 2014-03-04 14:44:48.882728178 +0100
+++ llvm-toolchain-snapshot_3.5~svn202473/clang/lib/Basic/FileManager.cpp 2014-02-28 09:56:58.455328015 +0100 +++ llvm-toolchain-snapshot_3.5~svn202847/clang/lib/Basic/FileManager.cpp 2014-03-04 14:44:48.878728178 +0100
@@ -476,6 +476,10 @@ @@ -476,6 +476,10 @@
UniqueRealFiles.erase(Entry->getUniqueID()); UniqueRealFiles.erase(Entry->getUniqueID());
} }
@ -13,13 +13,13 @@ Index: llvm-toolchain-snapshot_3.5~svn202473/clang/lib/Basic/FileManager.cpp
void FileManager::GetUniqueIDMapping( void FileManager::GetUniqueIDMapping(
SmallVectorImpl<const FileEntry *> &UIDToFiles) const { SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
Index: llvm-toolchain-snapshot_3.5~svn202473/lldb/include/lldb/lldb-defines.h Index: llvm-toolchain-snapshot_3.5~svn202847/lldb/include/lldb/lldb-defines.h
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn202473.orig/lldb/include/lldb/lldb-defines.h 2014-02-28 09:56:58.459328014 +0100 --- llvm-toolchain-snapshot_3.5~svn202847.orig/lldb/include/lldb/lldb-defines.h 2014-03-04 14:44:48.882728178 +0100
+++ llvm-toolchain-snapshot_3.5~svn202473/lldb/include/lldb/lldb-defines.h 2014-02-28 09:56:58.455328015 +0100 +++ llvm-toolchain-snapshot_3.5~svn202847/lldb/include/lldb/lldb-defines.h 2014-03-04 14:44:48.878728178 +0100
@@ -12,6 +12,11 @@ @@ -13,6 +13,11 @@
#include "lldb/lldb-types.h" #include "lldb/lldb-types.h"
#include "lldb/lldb-dll-export.h"
+// For GNU Hurd +// For GNU Hurd
+#if defined(__GNU__) && !defined(PATH_MAX) +#if defined(__GNU__) && !defined(PATH_MAX)
@ -29,10 +29,10 @@ Index: llvm-toolchain-snapshot_3.5~svn202473/lldb/include/lldb/lldb-defines.h
#if !defined(UINT32_MAX) #if !defined(UINT32_MAX)
#define UINT32_MAX 4294967295U #define UINT32_MAX 4294967295U
#endif #endif
Index: llvm-toolchain-snapshot_3.5~svn202473/lib/Support/Unix/Path.inc Index: llvm-toolchain-snapshot_3.5~svn202847/lib/Support/Unix/Path.inc
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn202473.orig/lib/Support/Unix/Path.inc 2014-02-28 09:56:58.459328014 +0100 --- llvm-toolchain-snapshot_3.5~svn202847.orig/lib/Support/Unix/Path.inc 2014-03-04 14:44:48.882728178 +0100
+++ llvm-toolchain-snapshot_3.5~svn202473/lib/Support/Unix/Path.inc 2014-02-28 09:56:58.455328015 +0100 +++ llvm-toolchain-snapshot_3.5~svn202847/lib/Support/Unix/Path.inc 2014-03-04 14:44:48.882728178 +0100
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
// For GNU Hurd // For GNU Hurd
#if defined(__GNU__) && !defined(PATH_MAX) #if defined(__GNU__) && !defined(PATH_MAX)