diff options
| -rw-r--r-- | include/llvm/ADT/Triple.h | 3 | ||||
| -rw-r--r-- | lib/Support/Triple.cpp | 4 | ||||
| -rw-r--r-- | unittests/ADT/TripleTest.cpp | 9 |
3 files changed, 2 insertions, 14 deletions
diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h index a47e5063d5..98f0b621aa 100644 --- a/include/llvm/ADT/Triple.h +++ b/include/llvm/ADT/Triple.h @@ -47,7 +47,7 @@ public: cellspu, // CellSPU: spu, cellspu hexagon, // Hexagon: hexagon mips, // MIPS: mips, mipsallegrex - mipsel, // MIPSEL: mipsel, mipsallegrexel, psp + mipsel, // MIPSEL: mipsel, mipsallegrexel mips64, // MIPS64: mips64 mips64el,// MIPS64EL: mips64el msp430, // MSP430: msp430 @@ -89,7 +89,6 @@ public: MinGW32, // i*86-pc-mingw32, *-w64-mingw32 NetBSD, OpenBSD, - Psp, Solaris, Win32, Haiku, diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp index ae69c60731..94333a3a99 100644 --- a/lib/Support/Triple.cpp +++ b/lib/Support/Triple.cpp @@ -107,7 +107,6 @@ const char *Triple::getOSTypeName(OSType Kind) { case MinGW32: return "mingw32"; case NetBSD: return "netbsd"; case OpenBSD: return "openbsd"; - case Psp: return "psp"; case Solaris: return "solaris"; case Win32: return "win32"; case Haiku: return "haiku"; @@ -232,7 +231,7 @@ static Triple::ArchType parseArch(StringRef ArchName) { .Cases("spu", "cellspu", Triple::cellspu) .Case("msp430", Triple::msp430) .Cases("mips", "mipseb", "mipsallegrex", Triple::mips) - .Cases("mipsel", "mipsallegrexel", "psp", Triple::mipsel) + .Cases("mipsel", "mipsallegrexel", Triple::mipsel) .Cases("mips64", "mips64eb", Triple::mips64) .Case("mips64el", Triple::mips64el) .Case("hexagon", Triple::hexagon) @@ -270,7 +269,6 @@ static Triple::OSType parseOS(StringRef OSName) { .StartsWith("mingw32", Triple::MinGW32) .StartsWith("netbsd", Triple::NetBSD) .StartsWith("openbsd", Triple::OpenBSD) - .StartsWith("psp", Triple::Psp) .StartsWith("solaris", Triple::Solaris) .StartsWith("win32", Triple::Win32) .StartsWith("haiku", Triple::Haiku) diff --git a/unittests/ADT/TripleTest.cpp b/unittests/ADT/TripleTest.cpp index 5fe9afd607..35a21877d5 100644 --- a/unittests/ADT/TripleTest.cpp +++ b/unittests/ADT/TripleTest.cpp @@ -162,12 +162,6 @@ TEST(TripleTest, Normalization) { for (int OS = 1+Triple::UnknownOS; OS <= Triple::Minix; ++OS) { C[2] = Triple::getOSTypeName(Triple::OSType(OS)); - // If a value has multiple interpretations, then the permutation - // test will inevitably fail. Currently this is only the case for - // "psp" which parses as both an architecture and an O/S. - if (OS == Triple::Psp) - continue; - std::string E = Join(C[0], C[1], C[2]); EXPECT_EQ(E, Triple::normalize(Join(C[0], C[1], C[2]))); @@ -212,9 +206,6 @@ TEST(TripleTest, Normalization) { } } - EXPECT_EQ("a-b-psp", Triple::normalize("a-b-psp")); - EXPECT_EQ("psp-b-c", Triple::normalize("psp-b-c")); - // Various real-world funky triples. The value returned by GCC's config.sub // is given in the comment. EXPECT_EQ("i386--mingw32", Triple::normalize("i386-mingw32")); // i386-pc-mingw32 |