proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-14 01:34:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* If we get an unexpected pass, do not break the tests

Browse Source 
do-not-fail-on-unexpected-pass.diff (I am disabling some tests)
* Fix the path detection of the objective h headers.
This commit is contained in:
Sylvestre Ledru 2013-12-02 10:51:04 +00:00
parent 4d87f4fe03
commit 85ad7aafba
5 changed files with 104 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -18,6 +18,9 @@ llvm-toolchain-3.4 (1:3.4~+rc1-3) unstable; urgency=low
* Make python-clang 3.4 also conflict with 3.5 (Closes: #730164)
* Port LLVM to mips64el. Thanks to YunQiang Su. Initially done for
3.3 and ported on the 3.4 (Closes: #730808)
* If we get an unexpected pass, do not break the tests
do-not-fail-on-unexpected-pass.diff (I am disabling some tests)
* Fix the path detection of the objective h headers.
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 01 Dec 2013 17:49:46 +0100

71
debian/patches/debian-mips64-n32-multiarch.diff vendored Normal file
View File

@ -0,0 +1,71 @@
Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/Driver/ToolChains.cpp 2013-12-01 17:59:04.054246320 +0100
+++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp 2013-12-01 18:01:14.610241621 +0100
@@ -1150,10 +1150,12 @@
static const char *const MIPS64LibDirs[] = { "/lib64", "/lib" };
static const char *const MIPS64Triples[] = { "mips64-linux-gnu",
- "mips-mti-linux-gnu" };
+ "mips-mti-linux-gnu",
+ "mips64-linux-gnuabi64" };
static const char *const MIPS64ELLibDirs[] = { "/lib64", "/lib" };
static const char *const MIPS64ELTriples[] = { "mips64el-linux-gnu",
- "mips-mti-linux-gnu" };
+ "mips-mti-linux-gnu",
+ "mips64el-linux-gnuabi64" };
static const char *const PPCLibDirs[] = { "/lib32", "/lib" };
static const char *const PPCTriples[] = {
@@ -1324,9 +1326,9 @@
}
static bool isMipsArch(llvm::Triple::ArchType Arch) {
- return Arch == llvm::Triple::mips ||
- Arch == llvm::Triple::mipsel ||
- Arch == llvm::Triple::mips64 ||
+ return Arch == llvm::Triple::mips ||
+ Arch == llvm::Triple::mipsel ||
+ Arch == llvm::Triple::mips64 ||
Arch == llvm::Triple::mips64el;
}
@@ -2309,6 +2311,14 @@
if (llvm::sys::fs::exists(SysRoot + "/lib/mipsel-linux-gnu"))
return "mipsel-linux-gnu";
return TargetTriple.str();
+ case llvm::Triple::mips64:
+ if (llvm::sys::fs::exists(SysRoot + "/lib/mips64-linux-gnuabi64"))
+ return "mips64-linux-gnuabi64";
+ return TargetTriple.str();
+ case llvm::Triple::mips64el:
+ if (llvm::sys::fs::exists(SysRoot + "/lib/mips64el-linux-gnuabi64"))
+ return "mips64el-linux-gnuabi64";
+ return TargetTriple.str();
case llvm::Triple::ppc:
if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc-linux-gnuspe"))
return "powerpc-linux-gnuspe";
@@ -2665,6 +2675,12 @@
const StringRef MIPSELMultiarchIncludeDirs[] = {
"/usr/include/mipsel-linux-gnu"
};
+ const StringRef MIPS64MultiarchIncludeDirs[] = {
+ "/usr/include/mips64-linux-gnuabi64"
+ };
+ const StringRef MIPS64ELMultiarchIncludeDirs[] = {
+ "/usr/include/mips64el-linux-gnuabi64"
+ };
const StringRef PPCMultiarchIncludeDirs[] = {
"/usr/include/powerpc-linux-gnu"
};
@@ -2687,6 +2703,10 @@
MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
} else if (getTriple().getArch() == llvm::Triple::mipsel) {
MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
+ } else if (getTriple().getArch() == llvm::Triple::mips64) {
+ MultiarchIncludeDirs = MIPS64MultiarchIncludeDirs;
+ } else if (getTriple().getArch() == llvm::Triple::mips64el) {
+ MultiarchIncludeDirs = MIPS64ELMultiarchIncludeDirs;
} else if (getTriple().getArch() == llvm::Triple::ppc) {
MultiarchIncludeDirs = PPCMultiarchIncludeDirs;
} else if (getTriple().getArch() == llvm::Triple::ppc64) {

13
debian/patches/do-not-fail-on-unexpected-pass.diff vendored Normal file
View File

@ -0,0 +1,13 @@
Index: llvm-toolchain-3.4-3.4~+rc1/utils/lit/lit/Test.py
===================================================================
--- llvm-toolchain-3.4-3.4~+rc1.orig/utils/lit/lit/Test.py 2013-09-14 03:19:17.000000000 +0200
+++ llvm-toolchain-3.4-3.4~+rc1/utils/lit/lit/Test.py 2013-12-01 23:11:25.721571881 +0100
@@ -27,7 +27,7 @@
PASS = ResultCode('PASS', False)
XFAIL = ResultCode('XFAIL', False)
FAIL = ResultCode('FAIL', True)
-XPASS = ResultCode('XPASS', True)
+XPASS = ResultCode('XPASS', False)
UNRESOLVED = ResultCode('UNRESOLVED', True)
UNSUPPORTED = ResultCode('UNSUPPORTED', False)

16
debian/patches/force-gcc-header-obj.diff vendored Normal file
View File

@ -0,0 +1,16 @@
Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/Driver/ToolChains.cpp 2013-12-02 10:15:22.000000000 +0100
+++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp 2013-12-02 10:16:54.648134997 +0100
@@ -2618,6 +2618,11 @@
return;
}
+ // Force the inclusion of the gcc headers (objc/objc.h)
+ addExternCSystemIncludeIfExists(
+ DriverArgs, CC1Args, GCCInstallation.getInstallPath() + "/include");
+
+
// Lacking those, try to detect the correct set of system includes for the
// target triple.

1
debian/patches/series vendored
View File

@ -32,3 +32,4 @@ silent-MCJIIT-tests.diff
include-target.diff
debian-mips64-n32-multiarch.diff
force-gcc-header-obj.diff