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

refresh patch

Browse Source
This commit is contained in:
Gianfranco Costamagna 2015-08-20 07:04:41 +00:00
parent 597ab19832
commit 86d6a0559f
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
debian/patches/bug783205.patch vendored
View File

@ -2,46 +2,46 @@ From: Steven Chamberlain <steven@pyro.eu.org>
Date: Sun, 10 May 2015 19:46:59 +0100 Date: Sun, 10 May 2015 19:46:59 +0100
Subject: support Debian s390x multiarch paths Subject: support Debian s390x multiarch paths
--- a/clang/lib/Driver/ToolChains.cpp --- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp +++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/ToolChains.cpp
@@ -2877,6 +2881,10 @@ static std::string getMultiarchTriple(co @@ -3092,6 +3092,10 @@ static std::string getMultiarchTriple(co
if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc64le-linux-gnu")) if (llvm::sys::fs::exists(SysRoot + "/lib/sparc64-linux-gnu"))
return "powerpc64le-linux-gnu"; return "sparc64-linux-gnu";
return TargetTriple.str(); break;
+ case llvm::Triple::systemz: + case llvm::Triple::systemz:
+ if (llvm::sys::fs::exists(SysRoot + "/lib/s390x-linux-gnu")) + if (llvm::sys::fs::exists(SysRoot + "/lib/s390x-linux-gnu"))
+ return "s390x-linux-gnu"; + return "s390x-linux-gnu";
+ return TargetTriple.str(); + break;
} }
return TargetTriple.str();
} }
@@ -3435,6 +3439,8 @@ void Linux::AddClangSystemIncludeArgs(co
@@ -3230,6 +3238,9 @@ void Linux::AddClangSystemIncludeArgs(co "/usr/include/sparc-linux-gnu"};
const StringRef PPC64LEMultiarchIncludeDirs[] = { const StringRef Sparc64MultiarchIncludeDirs[] = {
"/usr/include/powerpc64le-linux-gnu" "/usr/include/sparc64-linux-gnu"};
};
+ const StringRef SYSTEMZMultiarchIncludeDirs[] = { + const StringRef SYSTEMZMultiarchIncludeDirs[] = {
+ "/usr/include/s390x-linux-gnu" + "/usr/include/s390x-linux-gnu"};
+ };
ArrayRef<StringRef> MultiarchIncludeDirs; ArrayRef<StringRef> MultiarchIncludeDirs;
if (getTriple().getArch() == llvm::Triple::x86_64) { switch (getTriple().getArch()) {
MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; case llvm::Triple::x86_64:
@@ -3257,6 +3268,8 @@ void Linux::AddClangSystemIncludeArgs(co @@ -3480,6 +3486,9 @@ void Linux::AddClangSystemIncludeArgs(co
MultiarchIncludeDirs = PPC64MultiarchIncludeDirs; case llvm::Triple::sparcv9:
} else if (getTriple().getArch() == llvm::Triple::ppc64le) { MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs;
MultiarchIncludeDirs = PPC64LEMultiarchIncludeDirs; break;
+ } else if (getTriple().getArch() == llvm::Triple::systemz) { + case llvm::Triple::systemz:
+ MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs; + MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs;
+ break;
default:
break;
} }
for (StringRef Dir : MultiarchIncludeDirs) { --- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/Tools.cpp
if (llvm::sys::fs::exists(SysRoot + Dir)) { +++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/Tools.cpp
--- a/clang/lib/Driver/Tools.cpp @@ -8058,7 +8058,7 @@ static std::string getLinuxDynamicLinker
+++ b/clang/lib/Driver/Tools.cpp
@@ -7333,7 +7333,7 @@ static std::string getLinuxDynamicLinker
return "/lib64/ld64.so.1"; return "/lib64/ld64.so.1";
return "/lib64/ld64.so.2"; return "/lib64/ld64.so.2";
} else if (ToolChain.getArch() == llvm::Triple::systemz) } else if (Arch == llvm::Triple::systemz)
- return "/lib64/ld64.so.1"; - return "/lib64/ld64.so.1";
+ return "/lib/ld64.so.1"; + return "/lib/ld64.so.1";
else if (ToolChain.getArch() == llvm::Triple::sparcv9) else if (Arch == llvm::Triple::sparcv9)
return "/lib64/ld-linux.so.2"; return "/lib64/ld-linux.so.2";
else if (ToolChain.getArch() == llvm::Triple::x86_64 && else if (Arch == llvm::Triple::x86_64 &&

2
debian/patches/series vendored
View File

@ -40,4 +40,4 @@ compiler-rt-i586.diff
clang-analyzer-force-version.diff clang-analyzer-force-version.diff
locale-issue-ld.diff locale-issue-ld.diff
CVE-2015-2305.patch CVE-2015-2305.patch
#bug783205.patch bug783205.patch