rebase of the patches

This commit is contained in:
Sylvestre Ledru 2015-09-23 08:11:36 +00:00
parent 7bdc9d93f9
commit 7cc6cd2aab

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.5~svn211597/clang/lib/Basic/FileManager.cpp Index: llvm-toolchain-snapshot_3.8~svn248366/clang/lib/Basic/FileManager.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn211597.orig/clang/lib/Basic/FileManager.cpp --- llvm-toolchain-snapshot_3.8~svn248366.orig/clang/lib/Basic/FileManager.cpp
+++ llvm-toolchain-snapshot_3.5~svn211597/clang/lib/Basic/FileManager.cpp +++ llvm-toolchain-snapshot_3.8~svn248366/clang/lib/Basic/FileManager.cpp
@@ -492,6 +492,10 @@ void FileManager::invalidateCache(const @@ -499,6 +499,10 @@ void FileManager::invalidateCache(const
UniqueRealFiles.erase(Entry->getUniqueID()); UniqueRealFiles.erase(Entry->getUniqueID());
} }
@ -13,10 +13,10 @@ Index: llvm-toolchain-snapshot_3.5~svn211597/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~svn211597/lldb/include/lldb/lldb-defines.h Index: llvm-toolchain-snapshot_3.8~svn248366/lldb/include/lldb/lldb-defines.h
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn211597.orig/lldb/include/lldb/lldb-defines.h --- llvm-toolchain-snapshot_3.8~svn248366.orig/lldb/include/lldb/lldb-defines.h
+++ llvm-toolchain-snapshot_3.5~svn211597/lldb/include/lldb/lldb-defines.h +++ llvm-toolchain-snapshot_3.8~svn248366/lldb/include/lldb/lldb-defines.h
@@ -28,6 +28,11 @@ @@ -28,6 +28,11 @@
#define INT32_MAX 2147483647 #define INT32_MAX 2147483647
#endif #endif
@ -29,10 +29,10 @@ Index: llvm-toolchain-snapshot_3.5~svn211597/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~svn211597/lib/Support/Unix/Path.inc Index: llvm-toolchain-snapshot_3.8~svn248366/lib/Support/Unix/Path.inc
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn211597.orig/lib/Support/Unix/Path.inc --- llvm-toolchain-snapshot_3.8~svn248366.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-snapshot_3.5~svn211597/lib/Support/Unix/Path.inc +++ llvm-toolchain-snapshot_3.8~svn248366/lib/Support/Unix/Path.inc
@@ -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)
@ -41,19 +41,31 @@ Index: llvm-toolchain-snapshot_3.5~svn211597/lib/Support/Unix/Path.inc
#endif #endif
using namespace llvm; using namespace llvm;
Index: llvm-toolchain-snapshot-3.8~svn245286/tools/dsymutil/DwarfLinker.cpp Index: llvm-toolchain-snapshot_3.8~svn248366/tools/dsymutil/DwarfLinker.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot-3.8~svn245286.orig/tools/dsymutil/DwarfLinker.cpp --- llvm-toolchain-snapshot_3.8~svn248366.orig/tools/dsymutil/DwarfLinker.cpp
+++ llvm-toolchain-snapshot-3.8~svn245286/tools/dsymutil/DwarfLinker.cpp +++ llvm-toolchain-snapshot_3.8~svn248366/tools/dsymutil/DwarfLinker.cpp
@@ -1450,6 +1450,11 @@ private: @@ -40,6 +40,11 @@
uint32_t LastCIEOffset; #include <string>
}; #include <tuple>
+// For GNU Hurd +// For GNU Hurd
+#if defined(__GNU__) && !defined(PATH_MAX) +#if defined(__GNU__) && !defined(PATH_MAX)
+# define PATH_MAX 4096 +# define PATH_MAX 4096
+#endif +#endif
+ +
/// \brief Similar to DWARFUnitSection::getUnitForOffset(), but namespace llvm {
/// returning our CompileUnit object instead. namespace dsymutil {
CompileUnit *DwarfLinker::getUnitForOffset(unsigned Offset) {
@@ -1637,6 +1642,11 @@ PointerIntPair<DeclContext *, 1> DeclCon
if (const char *ResolvedPath = U.getResolvedPath(FileNum)) {
File = ResolvedPath;
} else {
+// For GNU Hurd
+#if defined(__GNU__) && !defined(PATH_MAX)
+# define PATH_MAX 4096
+#endif
+
char RealPath[PATH_MAX + 1];
RealPath[PATH_MAX] = 0;
if (::realpath(File.c_str(), RealPath))