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

refresh of the patches

Browse Source
This commit is contained in:
Sylvestre Ledru 2014-02-12 12:14:24 +00:00
parent 537558670c
commit 8c155772c2
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
debian/patches/debian-mips64-n32-multiarch.diff vendored
View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp Index: llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:46:57.392718304 -0800 --- llvm-toolchain-snapshot_3.5~svn201231.orig/clang/lib/Driver/ToolChains.cpp 2014-02-12 13:13:12.789835837 +0100
+++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:48:33.364715296 -0800 +++ llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp 2014-02-12 13:13:12.789835837 +0100
@@ -1312,11 +1312,13 @@ @@ -1324,11 +1324,13 @@
static const char *const MIPS64LibDirs[] = { "/lib64", "/lib" }; static const char *const MIPS64LibDirs[] = { "/lib64", "/lib" };
static const char *const MIPS64Triples[] = { "mips64-linux-gnu", static const char *const MIPS64Triples[] = { "mips64-linux-gnu",
@ -18,20 +18,7 @@ Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp
static const char *const PPCLibDirs[] = { "/lib32", "/lib" }; static const char *const PPCLibDirs[] = { "/lib32", "/lib" };
static const char *const PPCTriples[] = { static const char *const PPCTriples[] = {
@@ -1503,9 +1505,9 @@ @@ -2769,6 +2771,14 @@
}
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;
}
@@ -2522,6 +2524,14 @@
if (llvm::sys::fs::exists(SysRoot + "/lib/mipsel-linux-gnu")) if (llvm::sys::fs::exists(SysRoot + "/lib/mipsel-linux-gnu"))
return "mipsel-linux-gnu"; return "mipsel-linux-gnu";
return TargetTriple.str(); return TargetTriple.str();
@ -46,7 +33,7 @@ Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp
case llvm::Triple::ppc: case llvm::Triple::ppc:
if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc-linux-gnuspe")) if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc-linux-gnuspe"))
return "powerpc-linux-gnuspe"; return "powerpc-linux-gnuspe";
@@ -2881,6 +2891,12 @@ @@ -3122,6 +3132,12 @@
const StringRef MIPSELMultiarchIncludeDirs[] = { const StringRef MIPSELMultiarchIncludeDirs[] = {
"/usr/include/mipsel-linux-gnu" "/usr/include/mipsel-linux-gnu"
}; };
@ -59,7 +46,7 @@ Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp
const StringRef PPCMultiarchIncludeDirs[] = { const StringRef PPCMultiarchIncludeDirs[] = {
"/usr/include/powerpc-linux-gnu" "/usr/include/powerpc-linux-gnu"
}; };
@@ -2903,6 +2919,10 @@ @@ -3144,6 +3160,10 @@
MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
} else if (getTriple().getArch() == llvm::Triple::mipsel) { } else if (getTriple().getArch() == llvm::Triple::mipsel) {
MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;

14
debian/patches/libstdc++-header-i386.diff vendored
View File

@ -1,9 +1,9 @@
Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp Index: llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/ToolChains.cpp 2014-01-14 11:31:10.916868278 +0100 --- llvm-toolchain-snapshot_3.5~svn201231.orig/clang/lib/Driver/ToolChains.cpp 2014-02-12 13:12:51.069836368 +0100
+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp 2014-01-14 11:31:10.916868278 +0100 +++ llvm-toolchain-snapshot_3.5~svn201231/clang/lib/Driver/ToolChains.cpp 2014-02-12 13:12:51.065836368 +0100
@@ -2830,6 +2830,11 @@ @@ -3239,6 +3239,11 @@
StringRef BiarchSuffix = GCCInstallation.getBiarchSuffix(); const Multilib &Multilib = GCCInstallation.getMultilib();
const GCCVersion &Version = GCCInstallation.getVersion(); const GCCVersion &Version = GCCInstallation.getVersion();
+#ifdef __i386__ +#ifdef __i386__
@ -12,5 +12,5 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp
+#endif +#endif
+ +
if (addLibStdCXXIncludePaths(LibDir.str() + "/../include", if (addLibStdCXXIncludePaths(LibDir.str() + "/../include",
"/c++/" + Version.Text, TripleStr, BiarchSuffix, "/c++/" + Version.Text, TripleStr,
MIPSABIDirSuffix, DriverArgs, CC1Args)) Multilib.includeSuffix(), DriverArgs, CC1Args))