Skip to content

Commit 1014757

Browse files
committed
cleanup
1 parent b164f4c commit 1014757

File tree

7 files changed

+3
-33
lines changed

7 files changed

+3
-33
lines changed

clang/lib/Driver/Driver.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -808,9 +808,6 @@ static llvm::Triple computeTargetTriple(const Driver &D,
808808
else if (Target.getEnvironment() == llvm::Triple::Musl ||
809809
Target.getEnvironment() == llvm::Triple::MuslABIN32)
810810
Target.setEnvironment(llvm::Triple::MuslABI64);
811-
else if (Target.getEnvironment() == llvm::Triple::MuslF128 ||
812-
Target.getEnvironment() == llvm::Triple::MuslABIN3F128)
813-
Target.setEnvironment(llvm::Triple::MuslABI64F128);
814811
}
815812
}
816813
}

clang/lib/Driver/ToolChains/Arch/LoongArch.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,9 @@ StringRef loongarch::getLoongArchABI(const Driver &D, const ArgList &Args,
105105
switch (Triple.getEnvironment()) {
106106
case llvm::Triple::GNUSF:
107107
case llvm::Triple::MuslSF:
108-
case llvm::Triple::MuslSFF128:
109108
return IsLA32 ? "ilp32s" : "lp64s";
110109
case llvm::Triple::GNUF32:
111110
case llvm::Triple::MuslF32:
112-
case llvm::Triple::MuslF32F128:
113111
return IsLA32 ? "ilp32f" : "lp64f";
114112
case llvm::Triple::GNUF64:
115113
// This was originally permitted (and indeed the canonical way) to

clang/lib/Driver/ToolChains/Linux.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,15 @@ std::string Linux::getMultiarchTriple(const Driver &D,
110110
return TargetTriple.str();
111111
case llvm::Triple::GNUSF:
112112
case llvm::Triple::MuslSF:
113-
case llvm::Triple::MuslSFF128:
114113
FPFlavor = "sf";
115114
break;
116115
case llvm::Triple::GNUF32:
117116
case llvm::Triple::MuslF32:
118-
case llvm::Triple::MuslF32F128:
119117
FPFlavor = "f32";
120118
break;
121119
case llvm::Triple::GNU:
122120
case llvm::Triple::GNUF64:
123121
case llvm::Triple::Musl:
124-
case llvm::Triple::MuslF128:
125122
// This was going to be "f64" in an earlier Toolchain Conventions
126123
// revision, but starting from Feb 2023 the F64 ABI variants are
127124
// unmarked in their canonical forms.

llvm/include/llvm/IR/RuntimeLibcalls.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ enum Libcall {
5151

5252
/// A simple container for information about the supported runtime calls.
5353
struct RuntimeLibcallsInfo {
54-
/// Default libcalls for the triple. Note that `fixupLibcalls` should also be
55-
/// called in order to apply machine-specific and configurable behavior.
56-
explicit RuntimeLibcallsInfo(const Triple &TT) { initLibcalls(TT); }
54+
explicit RuntimeLibcallsInfo(const Triple &TT) {
55+
initLibcalls(TT);
56+
}
5757

5858
/// Rename the default libcall routine name for the specified libcall.
5959
void setLibcallName(RTLIB::Libcall Call, const char *Name) {

llvm/include/llvm/TargetParser/Triple.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -269,14 +269,6 @@ class Triple {
269269
MuslF32, // LoongArch ILP32F/LP64F
270270
MuslSF, // LoongArch ILP32S/LP64S
271271
MuslX32, // Musl using 32-bit ABI on x86_64
272-
// Musl with `*f128` math symbols available (e.g. `sqrtf128` rather than
273-
// only `sqrtl`). 32-bit musl variants are excluded sin e `*f128` symbols
274-
// are required to use `fp128` at all.
275-
MuslF128,
276-
MuslABI64F128,
277-
MuslF32F128,
278-
MuslSFF128,
279-
280272
LLVM,
281273

282274
MSVC,
@@ -835,10 +827,6 @@ class Triple {
835827
getEnvironment() == Triple::MuslF32 ||
836828
getEnvironment() == Triple::MuslSF ||
837829
getEnvironment() == Triple::MuslX32 ||
838-
getEnvironment() == Triple::MuslF128 ||
839-
getEnvironment() == Triple::MuslABI64F128 ||
840-
getEnvironment() == Triple::MuslF32F128 ||
841-
getEnvironment() == Triple::MuslSFF128 ||
842830
getEnvironment() == Triple::OpenHOS || isOSLiteOS();
843831
}
844832

llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchBaseInfo.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,10 @@ static ABI getTripleABI(const Triple &TT) {
5454
switch (TT.getEnvironment()) {
5555
case llvm::Triple::EnvironmentType::GNUSF:
5656
case llvm::Triple::EnvironmentType::MuslSF:
57-
case llvm::Triple::EnvironmentType::MuslSFF128:
5857
TripleABI = Is64Bit ? ABI_LP64S : ABI_ILP32S;
5958
break;
6059
case llvm::Triple::EnvironmentType::GNUF32:
6160
case llvm::Triple::EnvironmentType::MuslF32:
62-
case llvm::Triple::EnvironmentType::MuslF32F128:
6361
TripleABI = Is64Bit ? ABI_LP64F : ABI_ILP32F;
6462
break;
6563
// Let the fallback case behave like {ILP32,LP64}D.

llvm/lib/TargetParser/Triple.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,6 @@ StringRef Triple::getEnvironmentTypeName(EnvironmentType Kind) {
361361
case MuslSF:
362362
return "muslsf";
363363
case MuslX32: return "muslx32";
364-
case MuslF128: return "musl_f128";
365-
case MuslABI64F128: return "muslabi64_f128";
366-
case MuslF32F128: return "muslf32_f128";
367-
case MuslSFF128: return "muslsf_f128";
368364
case Simulator: return "simulator";
369365
case Pixel: return "pixel";
370366
case Vertex: return "vertex";
@@ -737,10 +733,6 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
737733
.StartsWith("gnut64", Triple::GNUT64)
738734
.StartsWith("gnu", Triple::GNU)
739735
.StartsWith("android", Triple::Android)
740-
.StartsWith("muslabi64_f128", Triple::MuslABI64F128)
741-
.StartsWith("muslf32_f128", Triple::MuslF32F128)
742-
.StartsWith("muslsf_f128", Triple::MuslSFF128)
743-
.StartsWith("musl_f128", Triple::MuslF128)
744736
.StartsWith("muslabin32", Triple::MuslABIN32)
745737
.StartsWith("muslabi64", Triple::MuslABI64)
746738
.StartsWith("musleabihf", Triple::MuslEABIHF)

0 commit comments

Comments
 (0)