refresh of some patches

This commit is contained in:
Sylvestre Ledru 2013-12-12 15:39:01 +00:00
parent bd01e955d7
commit 8eed0d09ae
5 changed files with 26 additions and 26 deletions

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.5~svn197156/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 @@
--- llvm-toolchain-snapshot_3.5~svn197156.orig/clang/lib/Driver/ToolChains.cpp 2013-12-12 16:38:08.665767586 +0100
+++ llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp 2013-12-12 16:38:08.661767586 +0100
@@ -1183,10 +1183,12 @@
static const char *const MIPS64LibDirs[] = { "/lib64", "/lib" };
static const char *const MIPS64Triples[] = { "mips64-linux-gnu",
@ -17,7 +17,7 @@ Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
static const char *const PPCLibDirs[] = { "/lib32", "/lib" };
static const char *const PPCTriples[] = {
@@ -1324,9 +1326,9 @@
@@ -1346,9 +1348,9 @@
}
static bool isMipsArch(llvm::Triple::ArchType Arch) {
@ -30,7 +30,7 @@ Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
Arch == llvm::Triple::mips64el;
}
@@ -2309,6 +2311,14 @@
@@ -2344,6 +2346,14 @@
if (llvm::sys::fs::exists(SysRoot + "/lib/mipsel-linux-gnu"))
return "mipsel-linux-gnu";
return TargetTriple.str();
@ -45,7 +45,7 @@ Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
case llvm::Triple::ppc:
if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc-linux-gnuspe"))
return "powerpc-linux-gnuspe";
@@ -2665,6 +2675,12 @@
@@ -2696,6 +2706,12 @@
const StringRef MIPSELMultiarchIncludeDirs[] = {
"/usr/include/mipsel-linux-gnu"
};
@ -58,7 +58,7 @@ Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
const StringRef PPCMultiarchIncludeDirs[] = {
"/usr/include/powerpc-linux-gnu"
};
@@ -2687,6 +2703,10 @@
@@ -2718,6 +2734,10 @@
MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
} else if (getTriple().getArch() == llvm::Triple::mipsel) {
MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;

View File

@ -1,16 +1,16 @@
Index: llvm-toolchain-snapshot_3.5~svn195930/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.5~svn195930.orig/clang/lib/Driver/ToolChains.cpp 2013-11-28 20:00:36.083311481 +0100
+++ llvm-toolchain-snapshot_3.5~svn195930/clang/lib/Driver/ToolChains.cpp 2013-11-29 11:15:58.145335055 +0100
@@ -134,6 +134,7 @@
.Default(0);
--- llvm-toolchain-snapshot_3.5~svn197156.orig/clang/lib/Driver/ToolChains.cpp 2013-12-12 16:37:40.637766690 +0100
+++ llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp 2013-12-12 16:37:40.637766690 +0100
@@ -149,6 +149,7 @@
A->getValue() == StringRef("soft"));
}
+
StringRef Darwin::getDarwinArchName(const ArgList &Args) const {
switch (getTriple().getArch()) {
default:
@@ -1973,6 +1974,8 @@
@@ -2010,6 +2011,8 @@
DriverArgs.hasArg(options::OPT_nostdincxx))
return;

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.5~svn197156/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 @@
--- llvm-toolchain-snapshot_3.5~svn197156.orig/clang/lib/Driver/ToolChains.cpp 2013-12-12 16:38:10.897767658 +0100
+++ llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp 2013-12-12 16:38:10.897767658 +0100
@@ -2654,6 +2654,11 @@
return;
}

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/Driver/ToolChains.cpp 2013-12-01 16:44:29.334277797 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp 2013-12-01 16:44:29.294277798 +0000
@@ -2773,7 +2773,7 @@
--- llvm-toolchain-snapshot_3.5~svn197156.orig/clang/lib/Driver/ToolChains.cpp 2013-12-12 16:38:06.033767502 +0100
+++ llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Driver/ToolChains.cpp 2013-12-12 16:38:06.029767502 +0100
@@ -2804,7 +2804,7 @@
#ifdef __i386__
// clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp
Index: llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Basic/Targets.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Basic/Targets.cpp 2013-11-04 09:46:53.320669497 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Basic/Targets.cpp 2013-11-04 09:46:53.320669497 +0100
@@ -3679,33 +3679,6 @@
--- llvm-toolchain-snapshot_3.5~svn197156.orig/clang/lib/Basic/Targets.cpp 2013-12-12 16:37:57.405767226 +0100
+++ llvm-toolchain-snapshot_3.5~svn197156/clang/lib/Basic/Targets.cpp 2013-12-12 16:37:57.401767226 +0100
@@ -3702,33 +3702,6 @@
return Version >= 7;
}