proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-09 14:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase of the patch

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff vendored
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_4.0~svn280802.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 +++ llvm-toolchain-snapshot_4.0~svn280802/lldb/third_party/Python/module/unittest2/unittest2/runner.py
@@ -171,9 +171,9 @@ class TextTestRunner(unittest.TextTestRu @@ -174,9 +174,9 @@ class TextTestRunner(unittest.TextTestRu
if hasattr(result, 'separator2'): if hasattr(result, 'separator2'):
self.stream.writeln(result.separator2) self.stream.writeln(result.separator2)
run = result.testsRun run = result.testsRun

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

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

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