mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-11-04 18:31:45 +00:00
85ad7aafba
do-not-fail-on-unexpected-pass.diff (I am disabling some tests) * Fix the path detection of the objective h headers.
72 lines
3.2 KiB
Diff
72 lines
3.2 KiB
Diff
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) {
|