rebase of the patch

This commit is contained in:
Sylvestre Ledru 2016-09-07 11:54:40 +00:00
parent dd6e50309f
commit d25de30fef
4 changed files with 48 additions and 47 deletions

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.8~svn255217/lldb/third_party/Python/module/unittest2/unittest2/runner.py
Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/third_party/Python/module/unittest2/unittest2/runner.py
===================================================================
--- llvm-toolchain-snapshot_3.8~svn255217.orig/lldb/third_party/Python/module/unittest2/unittest2/runner.py
+++ llvm-toolchain-snapshot_3.8~svn255217/lldb/third_party/Python/module/unittest2/unittest2/runner.py
@@ -171,9 +171,9 @@ class TextTestRunner(unittest.TextTestRu
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/third_party/Python/module/unittest2/unittest2/runner.py
+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/third_party/Python/module/unittest2/unittest2/runner.py
@@ -174,9 +174,9 @@ class TextTestRunner(unittest.TextTestRu
if hasattr(result, 'separator2'):
self.stream.writeln(result.separator2)
run = result.testsRun
@ -12,6 +12,6 @@ Index: llvm-toolchain-snapshot_3.8~svn255217/lldb/third_party/Python/module/unit
+# self.stream.writeln("Ran %d test%s in %.3fs" %
+# (run, run != 1 and "s" or "", timeTaken))
+# self.stream.writeln()
expectedFails = unexpectedSuccesses = skipped = passed = failed = errored = 0
try:

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_4.0~svn278655/clang/lib/Basic/FileManager.cpp
Index: llvm-toolchain-snapshot_4.0~svn280802/clang/lib/Basic/FileManager.cpp
===================================================================
--- llvm-toolchain-snapshot_4.0~svn278655.orig/clang/lib/Basic/FileManager.cpp
+++ llvm-toolchain-snapshot_4.0~svn278655/clang/lib/Basic/FileManager.cpp
--- llvm-toolchain-snapshot_4.0~svn280802.orig/clang/lib/Basic/FileManager.cpp
+++ llvm-toolchain-snapshot_4.0~svn280802/clang/lib/Basic/FileManager.cpp
@@ -500,6 +500,12 @@ void FileManager::invalidateCache(const
UniqueRealFiles.erase(Entry->getUniqueID());
}
@ -15,12 +15,12 @@ Index: llvm-toolchain-snapshot_4.0~svn278655/clang/lib/Basic/FileManager.cpp
void FileManager::GetUniqueIDMapping(
SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
UIDToFiles.clear();
Index: llvm-toolchain-snapshot_4.0~svn278655/lldb/include/lldb/lldb-defines.h
Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/include/lldb/lldb-defines.h
===================================================================
--- llvm-toolchain-snapshot_4.0~svn278655.orig/lldb/include/lldb/lldb-defines.h
+++ llvm-toolchain-snapshot_4.0~svn278655/lldb/include/lldb/lldb-defines.h
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/include/lldb/lldb-defines.h
+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/include/lldb/lldb-defines.h
@@ -28,6 +28,11 @@
#define INT32_MAX 2147483647
#define INT32_MAX 2147483647
#endif
+// For GNU Hurd
@ -29,12 +29,12 @@ Index: llvm-toolchain-snapshot_4.0~svn278655/lldb/include/lldb/lldb-defines.h
+#endif
+
#if !defined(UINT32_MAX)
#define UINT32_MAX 4294967295U
#define UINT32_MAX 4294967295U
#endif
Index: llvm-toolchain-snapshot_4.0~svn278655/lib/Support/Unix/Path.inc
Index: llvm-toolchain-snapshot_4.0~svn280802/lib/Support/Unix/Path.inc
===================================================================
--- llvm-toolchain-snapshot_4.0~svn278655.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-snapshot_4.0~svn278655/lib/Support/Unix/Path.inc
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-snapshot_4.0~svn280802/lib/Support/Unix/Path.inc
@@ -62,6 +62,7 @@
// For GNU Hurd
#if defined(__GNU__) && !defined(PATH_MAX)
@ -43,10 +43,10 @@ Index: llvm-toolchain-snapshot_4.0~svn278655/lib/Support/Unix/Path.inc
#endif
#include <sys/types.h>
Index: llvm-toolchain-snapshot_4.0~svn278655/tools/dsymutil/DwarfLinker.cpp
Index: llvm-toolchain-snapshot_4.0~svn280802/tools/dsymutil/DwarfLinker.cpp
===================================================================
--- llvm-toolchain-snapshot_4.0~svn278655.orig/tools/dsymutil/DwarfLinker.cpp
+++ llvm-toolchain-snapshot_4.0~svn278655/tools/dsymutil/DwarfLinker.cpp
--- llvm-toolchain-snapshot_4.0~svn280802.orig/tools/dsymutil/DwarfLinker.cpp
+++ llvm-toolchain-snapshot_4.0~svn280802/tools/dsymutil/DwarfLinker.cpp
@@ -41,6 +41,11 @@
#include <string>
#include <tuple>

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-3.9_3.9~+rc3/compiler-rt/cmake/config-ix.cmake
Index: llvm-toolchain-snapshot_4.0~svn280802/compiler-rt/cmake/config-ix.cmake
===================================================================
--- llvm-toolchain-3.9_3.9~+rc3.orig/compiler-rt/cmake/config-ix.cmake
+++ llvm-toolchain-3.9_3.9~+rc3/compiler-rt/cmake/config-ix.cmake
@@ -397,7 +397,8 @@ endif()
--- llvm-toolchain-snapshot_4.0~svn280802.orig/compiler-rt/cmake/config-ix.cmake
+++ llvm-toolchain-snapshot_4.0~svn280802/compiler-rt/cmake/config-ix.cmake
@@ -415,7 +415,8 @@ list_replace(COMPILER_RT_SANITIZERS_TO_B
if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
(OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD" OR
@ -12,10 +12,10 @@ Index: llvm-toolchain-3.9_3.9~+rc3/compiler-rt/cmake/config-ix.cmake
set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
else()
set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)
Index: llvm-toolchain-3.9_3.9~+rc3/tools/llvm-shlib/CMakeLists.txt
Index: llvm-toolchain-snapshot_4.0~svn280802/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm-toolchain-3.9_3.9~+rc3.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-3.9_3.9~+rc3/tools/llvm-shlib/CMakeLists.txt
--- llvm-toolchain-snapshot_4.0~svn280802.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_4.0~svn280802/tools/llvm-shlib/CMakeLists.txt
@@ -40,7 +40,7 @@ add_llvm_library(LLVM SHARED DISABLE_LLV
set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
@ -25,11 +25,11 @@ Index: llvm-toolchain-3.9_3.9~+rc3/tools/llvm-shlib/CMakeLists.txt
# GNU ld doesn't resolve symbols in the version script.
set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
Index: llvm-toolchain-3.9_3.9~+rc3/lldb/cmake/LLDBDependencies.cmake
Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/cmake/LLDBDependencies.cmake
===================================================================
--- llvm-toolchain-3.9_3.9~+rc3.orig/lldb/cmake/LLDBDependencies.cmake
+++ llvm-toolchain-3.9_3.9~+rc3/lldb/cmake/LLDBDependencies.cmake
@@ -163,7 +163,7 @@ if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB )
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/cmake/LLDBDependencies.cmake
+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/cmake/LLDBDependencies.cmake
@@ -166,7 +166,7 @@ if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB )
endif()
# On FreeBSD/NetBSD backtrace() is provided by libexecinfo, not libc.
@ -38,11 +38,11 @@ Index: llvm-toolchain-3.9_3.9~+rc3/lldb/cmake/LLDBDependencies.cmake
list(APPEND LLDB_SYSTEM_LIBS execinfo)
endif()
Index: llvm-toolchain-3.9_3.9~+rc3/lldb/scripts/utilsOsType.py
Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/utilsOsType.py
===================================================================
--- llvm-toolchain-3.9_3.9~+rc3.orig/lldb/scripts/utilsOsType.py
+++ llvm-toolchain-3.9_3.9~+rc3/lldb/scripts/utilsOsType.py
@@ -35,6 +35,7 @@ if sys.version_info.major >= 3:
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/scripts/utilsOsType.py
+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/utilsOsType.py
@@ -36,6 +36,7 @@ if sys.version_info.major >= 3:
Linux = 3
NetBSD = 4
Windows = 5
@ -50,17 +50,18 @@ Index: llvm-toolchain-3.9_3.9~+rc3/lldb/scripts/utilsOsType.py
else:
class EnumOsType(object):
values = ["Unknown",
@@ -42,7 +43,8 @@ else:
@@ -43,7 +44,9 @@ else:
"FreeBSD",
"Linux",
"NetBSD",
- "Windows"]
+ "Windows",
+ "kFreeBSD"]
+ "kFreeBSD"
+ ]
class __metaclass__(type):
#++---------------------------------------------------------------------------
# Details: Fn acts as an enumeration.
@@ -86,5 +88,7 @@ def determine_os_type():
#++----------------------------------------------------------------
@@ -91,5 +94,7 @@ def determine_os_type():
eOSType = EnumOsType.NetBSD
elif strOS == "win32":
eOSType = EnumOsType.Windows
@ -68,10 +69,10 @@ Index: llvm-toolchain-3.9_3.9~+rc3/lldb/scripts/utilsOsType.py
+ eOSType = EnumOsType.kFreeBSD
return eOSType
Index: llvm-toolchain-3.9_3.9~+rc3/lldb/scripts/Python/modules/CMakeLists.txt
Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/Python/modules/CMakeLists.txt
===================================================================
--- llvm-toolchain-3.9_3.9~+rc3.orig/lldb/scripts/Python/modules/CMakeLists.txt
+++ llvm-toolchain-3.9_3.9~+rc3/lldb/scripts/Python/modules/CMakeLists.txt
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/scripts/Python/modules/CMakeLists.txt
+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/Python/modules/CMakeLists.txt
@@ -5,7 +5,7 @@ if (CXX_SUPPORTS_NO_MACRO_REDEFINED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-macro-redefined")
endif ()

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_4.0~svn275970/lldb/scripts/Python/finishSwigPythonLLDB.py
Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/Python/finishSwigPythonLLDB.py
===================================================================
--- llvm-toolchain-snapshot_4.0~svn275970.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ llvm-toolchain-snapshot_4.0~svn275970/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -392,7 +392,7 @@ def make_symlink_liblldb(vDictArgs, vstr
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -443,7 +443,7 @@ def make_symlink_liblldb(
if eOSType == utilsOsType.EnumOsType.Darwin:
strLibFileExtn = ".dylib"
else:
@ -10,4 +10,4 @@ Index: llvm-toolchain-snapshot_4.0~svn275970/lldb/scripts/Python/finishSwigPytho
+ strLibFileExtn = "-4.0.so"
strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
bOk, strErrMsg = make_symlink(vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget)
bOk, strErrMsg = make_symlink(