[Triple][Driver] Add muslx32 environment and use /lib/ld-musl-x32.so.1 for -dynamic-linker
Differential Revision: https://reviews.llvm.org/D99308
This commit is contained in:
parent
886f9ff531
commit
ed956554f9
|
@ -401,6 +401,11 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
|
|||
case llvm::Triple::x86:
|
||||
ArchName = "i386";
|
||||
break;
|
||||
case llvm::Triple::x86_64:
|
||||
ArchName = Triple.getEnvironment() == llvm::Triple::MuslX32
|
||||
? "x32"
|
||||
: Triple.getArchName().str();
|
||||
break;
|
||||
default:
|
||||
ArchName = Triple.getArchName().str();
|
||||
}
|
||||
|
|
|
@ -75,3 +75,7 @@
|
|||
// RUN: %clang -### %s --target=i686-linux-musl --sysroot= \
|
||||
// RUN: --stdlib=platform --rtlib=platform 2>&1 | FileCheck %s --check-prefix=MUSL_I686
|
||||
// MUSL_I686: "-dynamic-linker" "/lib/ld-musl-i386.so.1"
|
||||
|
||||
// RUN: %clang -### %s --target=x86_64-linux-muslx32 --sysroot= \
|
||||
// RUN: --stdlib=platform --rtlib=platform 2>&1 | FileCheck %s --check-prefix=MUSL_X32
|
||||
// MUSL_X32: "-dynamic-linker" "/lib/ld-musl-x32.so.1"
|
||||
|
|
|
@ -218,6 +218,7 @@ public:
|
|||
Musl,
|
||||
MuslEABI,
|
||||
MuslEABIHF,
|
||||
MuslX32,
|
||||
|
||||
MSVC,
|
||||
Itanium,
|
||||
|
@ -688,7 +689,8 @@ public:
|
|||
bool isMusl() const {
|
||||
return getEnvironment() == Triple::Musl ||
|
||||
getEnvironment() == Triple::MuslEABI ||
|
||||
getEnvironment() == Triple::MuslEABIHF;
|
||||
getEnvironment() == Triple::MuslEABIHF ||
|
||||
getEnvironment() == Triple::MuslX32;
|
||||
}
|
||||
|
||||
/// Tests whether the target is SPIR (32- or 64-bit).
|
||||
|
|
|
@ -250,6 +250,7 @@ StringRef Triple::getEnvironmentTypeName(EnvironmentType Kind) {
|
|||
case Musl: return "musl";
|
||||
case MuslEABI: return "musleabi";
|
||||
case MuslEABIHF: return "musleabihf";
|
||||
case MuslX32: return "muslx32";
|
||||
case Simulator: return "simulator";
|
||||
}
|
||||
|
||||
|
@ -555,6 +556,7 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
|
|||
.StartsWith("android", Triple::Android)
|
||||
.StartsWith("musleabihf", Triple::MuslEABIHF)
|
||||
.StartsWith("musleabi", Triple::MuslEABI)
|
||||
.StartsWith("muslx32", Triple::MuslX32)
|
||||
.StartsWith("musl", Triple::Musl)
|
||||
.StartsWith("msvc", Triple::MSVC)
|
||||
.StartsWith("itanium", Triple::Itanium)
|
||||
|
|
|
@ -111,6 +111,12 @@ TEST(TripleTest, ParsedIDs) {
|
|||
EXPECT_EQ(Triple::Linux, T.getOS());
|
||||
EXPECT_EQ(Triple::Musl, T.getEnvironment());
|
||||
|
||||
T = Triple("x86_64-pc-linux-muslx32");
|
||||
EXPECT_EQ(Triple::x86_64, T.getArch());
|
||||
EXPECT_EQ(Triple::PC, T.getVendor());
|
||||
EXPECT_EQ(Triple::Linux, T.getOS());
|
||||
EXPECT_EQ(Triple::MuslX32, T.getEnvironment());
|
||||
|
||||
// PS4 has two spellings for the vendor.
|
||||
T = Triple("x86_64-scei-ps4");
|
||||
EXPECT_EQ(Triple::x86_64, T.getArch());
|
||||
|
|
Loading…
Reference in New Issue