summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Support/Triple.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index 2e0f462c3c..149c0b2a80 100644
--- a/lib/Support/Triple.cpp
+++ b/lib/Support/Triple.cpp
@@ -160,8 +160,18 @@ Triple::ArchType Triple::getArchTypeForLLVMName(StringRef Name) {
.Case("cellspu", cellspu)
.Case("mips", mips)
.Case("mipsel", mipsel)
+ .Case("mipsisa32", mips)
+ .Case("mipsisa32el", mipsel)
+ .Case("mipsisa32r2", mips)
+ .Case("mipsisa32r2el", mipsel)
.Case("mips64", mips64)
.Case("mips64el", mips64el)
+ .Case("mipsisa64", mips64)
+ .Case("mipsisa64el", mips64el)
+ .Case("mipsisa64r2", mips64)
+ .Case("mipsisa64r2el", mips64el)
+ .Case("mips64octeon", mips64)
+ .Case("mips64octeonel", mips64el)
.Case("msp430", msp430)
.Case("ppc64", ppc64)
.Case("ppc32", ppc)
@@ -228,10 +238,10 @@ static Triple::ArchType parseArch(StringRef ArchName) {
.StartsWith("thumbv", Triple::thumb)
.Cases("spu", "cellspu", Triple::cellspu)
.Case("msp430", Triple::msp430)
- .Cases("mips", "mipseb", "mipsallegrex", Triple::mips)
- .Cases("mipsel", "mipsallegrexel", Triple::mipsel)
- .Cases("mips64", "mips64eb", Triple::mips64)
- .Case("mips64el", Triple::mips64el)
+ .Cases("mips", "mipseb", "mipsisa32", "mipsisa32r2", "mipsallegrex", Triple::mips)
+ .Cases("mipsel", "mipsisa32el", "mipsisa32r2el", "mipsallegrexel", Triple::mipsel)
+ .Cases("mips64", "mips64eb", "mipsisa64", "mipsisa64r2", "mips64octeon", Triple::mips64)
+ .Cases("mips64el", "mipsisa64el", "mipsisa64r2el", "mips64octeonel", Triple::mips64el)
.Case("r600", Triple::r600)
.Case("hexagon", Triple::hexagon)
.Case("sparc", Triple::sparc)
@@ -294,6 +304,8 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
.StartsWith("uclibceabi", Triple::GNUEABI)
.StartsWith("musleabi", Triple::GNUEABI)
.StartsWith("gnu", Triple::GNU)
+ .StartsWith("uclibc", Triple::GNU)
+ .StartsWith("musl", Triple::GNU)
.StartsWith("macho", Triple::MachO)
.StartsWith("android", Triple::Android)
.StartsWith("elf", Triple::ELF)