This is an archive of the discontinued LLVM Phabricator instance.

Differential D12430

Support Debian s390x multiarch paths
ClosedPublic

Authored by sylvestre.ledru on Aug 28 2015, 4:59 AM.

Details

Reviewers
uweigand
Commits
rGc0babf2bc087: Support Debian s390x multiarch paths
rC246295: Support Debian s390x multiarch paths
rL246295: Support Debian s390x multiarch paths
Summary

Patch by Steven Chamberlain <steven@pyro.eu.org>

Diff Detail

Event Timeline

sylvestre.ledru updated this revision to Diff 33413.Aug 28 2015, 4:59 AM
sylvestre.ledru retitled this revision from to Support Debian s390x multiarch paths.
sylvestre.ledru updated this object.
sylvestre.ledru added a reviewer: uweigand.
uweigand accepted this revision.Aug 28 2015, 5:26 AM
uweigand edited edge metadata.

LGTM

This revision is now accepted and ready to land.Aug 28 2015, 5:26 AM
sylvestre.ledru closed this revision.Aug 28 2015, 5:27 AM

Revision Contents

PathSize
lib/
Driver/
9 lines
2 lines

Diff 33413

lib/Driver/ToolChains.cpp

Show First 20 Lines • Show All 3,093 Lines • ▼ Show 20 Linesstatic std::string getMultiarchTriple(const llvm::Triple &TargetTriple,
case llvm::Triple::sparc: case llvm::Triple::sparc:
if (llvm::sys::fs::exists(SysRoot + "/lib/sparc-linux-gnu")) if (llvm::sys::fs::exists(SysRoot + "/lib/sparc-linux-gnu"))
return "sparc-linux-gnu"; return "sparc-linux-gnu";
break; break;
case llvm::Triple::sparcv9: case llvm::Triple::sparcv9:
if (llvm::sys::fs::exists(SysRoot + "/lib/sparc64-linux-gnu")) if (llvm::sys::fs::exists(SysRoot + "/lib/sparc64-linux-gnu"))
return "sparc64-linux-gnu"; return "sparc64-linux-gnu";
break; break;
case llvm::Triple::systemz:
if (llvm::sys::fs::exists(SysRoot + "/lib/s390x-linux-gnu"))
return "s390x-linux-gnu";
break;
} }
return TargetTriple.str(); return TargetTriple.str();
} }
static void addPathIfExists(Twine Path, ToolChain::path_list &Paths) { static void addPathIfExists(Twine Path, ToolChain::path_list &Paths) {
if (llvm::sys::fs::exists(Path)) if (llvm::sys::fs::exists(Path))
Paths.push_back(Path.str()); Paths.push_back(Path.str());
} }
▲ Show 20 Lines • Show All 327 Lines • ▼ Show 20 Linesvoid Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
const StringRef PPC64MultiarchIncludeDirs[] = { const StringRef PPC64MultiarchIncludeDirs[] = {
"/usr/include/powerpc64-linux-gnu"}; "/usr/include/powerpc64-linux-gnu"};
const StringRef PPC64LEMultiarchIncludeDirs[] = { const StringRef PPC64LEMultiarchIncludeDirs[] = {
"/usr/include/powerpc64le-linux-gnu"}; "/usr/include/powerpc64le-linux-gnu"};
const StringRef SparcMultiarchIncludeDirs[] = { const StringRef SparcMultiarchIncludeDirs[] = {
"/usr/include/sparc-linux-gnu"}; "/usr/include/sparc-linux-gnu"};
const StringRef Sparc64MultiarchIncludeDirs[] = { const StringRef Sparc64MultiarchIncludeDirs[] = {
"/usr/include/sparc64-linux-gnu"}; "/usr/include/sparc64-linux-gnu"};
const StringRef SYSTEMZMultiarchIncludeDirs[] = {
"/usr/include/s390x-linux-gnu"};
ArrayRef<StringRef> MultiarchIncludeDirs; ArrayRef<StringRef> MultiarchIncludeDirs;
switch (getTriple().getArch()) { switch (getTriple().getArch()) {
case llvm::Triple::x86_64: case llvm::Triple::x86_64:
MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
break; break;
case llvm::Triple::x86: case llvm::Triple::x86:
MultiarchIncludeDirs = X86MultiarchIncludeDirs; MultiarchIncludeDirs = X86MultiarchIncludeDirs;
break; break;
Show All 29 Lines case llvm::Triple::ppc64le:
MultiarchIncludeDirs = PPC64LEMultiarchIncludeDirs; MultiarchIncludeDirs = PPC64LEMultiarchIncludeDirs;
break; break;
case llvm::Triple::sparc: case llvm::Triple::sparc:
MultiarchIncludeDirs = SparcMultiarchIncludeDirs; MultiarchIncludeDirs = SparcMultiarchIncludeDirs;
break; break;
case llvm::Triple::sparcv9: case llvm::Triple::sparcv9:
MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs; MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs;
break; break;
case llvm::Triple::systemz:
MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs;
break;
default: default:
break; break;
} }
for (StringRef Dir : MultiarchIncludeDirs) { for (StringRef Dir : MultiarchIncludeDirs) {
if (llvm::sys::fs::exists(SysRoot + Dir)) { if (llvm::sys::fs::exists(SysRoot + Dir)) {
addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + Dir); addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + Dir);
break; break;
} }
▲ Show 20 Lines • Show All 345 Lines • Show Last 20 Lines

lib/Driver/Tools.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 8,116 Lines • ▼ Show 20 Lines else if (Arch == llvm::Triple::ppc64) {
if (ppc::hasPPCAbiArg(Args, "elfv2")) if (ppc::hasPPCAbiArg(Args, "elfv2"))
return "/lib64/ld64.so.2"; return "/lib64/ld64.so.2";
return "/lib64/ld64.so.1"; return "/lib64/ld64.so.1";
} else if (Arch == llvm::Triple::ppc64le) { } else if (Arch == llvm::Triple::ppc64le) {
if (ppc::hasPPCAbiArg(Args, "elfv1")) if (ppc::hasPPCAbiArg(Args, "elfv1"))
return "/lib64/ld64.so.1"; return "/lib64/ld64.so.1";
return "/lib64/ld64.so.2"; return "/lib64/ld64.so.2";
} else if (Arch == llvm::Triple::systemz) } else if (Arch == llvm::Triple::systemz)
return "/lib64/ld64.so.1"; return "/lib/ld64.so.1";
else if (Arch == llvm::Triple::sparcv9) else if (Arch == llvm::Triple::sparcv9)
return "/lib64/ld-linux.so.2"; return "/lib64/ld-linux.so.2";
else if (Arch == llvm::Triple::x86_64 && else if (Arch == llvm::Triple::x86_64 &&
ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUX32) ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUX32)
return "/libx32/ld-linux-x32.so.2"; return "/libx32/ld-linux-x32.so.2";
else else
return "/lib64/ld-linux-x86-64.so.2"; return "/lib64/ld-linux-x86-64.so.2";
} }
▲ Show 20 Lines • Show All 1,537 Lines • Show Last 20 Lines