diff options
| author | Dan Gohman <dan433584@gmail.com> | 2015-06-30 03:52:25 +0000 |
|---|---|---|
| committer | Dan Gohman <dan433584@gmail.com> | 2015-06-30 03:52:25 +0000 |
| commit | 8465c00762751d3145220e29a3a503b2dab41b40 (patch) | |
| tree | b0e077409b0a0ca43edf4c681e0e5e8237a5401c | |
| parent | 0ad71d982c8b1023d6f5fc1c516c1e0900c75978 (diff) | |
| download | bcm5719-llvm-8465c00762751d3145220e29a3a503b2dab41b40.tar.gz bcm5719-llvm-8465c00762751d3145220e29a3a503b2dab41b40.zip | |
Drop the OS from the WebAssembly target triple for now.
This unbreaks TripleTest.Normalization. We'll have to come up with a new
plan for the OS component of the target triple for WebAssembly.
llvm-svn: 241041
| -rw-r--r-- | llvm/include/llvm/ADT/Triple.h | 3 | ||||
| -rw-r--r-- | llvm/lib/Support/Triple.cpp | 2 | ||||
| -rw-r--r-- | llvm/unittests/ADT/TripleTest.cpp | 8 |
3 files changed, 5 insertions, 8 deletions
diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h index f26cadb0154..06f5870119c 100644 --- a/llvm/include/llvm/ADT/Triple.h +++ b/llvm/include/llvm/ADT/Triple.h @@ -153,8 +153,7 @@ public: NVCL, // NVIDIA OpenCL AMDHSA, // AMD HSA Runtime PS4, - WebAssembly, - LastOSType = WebAssembly + LastOSType = PS4 }; enum EnvironmentType { UnknownEnvironment, diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index 1bd0d0187d5..92be0e047f6 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -177,7 +177,6 @@ const char *Triple::getOSTypeName(OSType Kind) { case NVCL: return "nvcl"; case AMDHSA: return "amdhsa"; case PS4: return "ps4"; - case WebAssembly: return "wasm"; } llvm_unreachable("Invalid OSType"); @@ -415,7 +414,6 @@ static Triple::OSType parseOS(StringRef OSName) { .StartsWith("nvcl", Triple::NVCL) .StartsWith("amdhsa", Triple::AMDHSA) .StartsWith("ps4", Triple::PS4) - .StartsWith("wasm", Triple::WebAssembly) .Default(Triple::UnknownOS); } diff --git a/llvm/unittests/ADT/TripleTest.cpp b/llvm/unittests/ADT/TripleTest.cpp index dfeebacfdaa..d50768412d7 100644 --- a/llvm/unittests/ADT/TripleTest.cpp +++ b/llvm/unittests/ADT/TripleTest.cpp @@ -182,16 +182,16 @@ TEST(TripleTest, ParsedIDs) { EXPECT_EQ(Triple::CloudABI, T.getOS()); EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment()); - T = Triple("wasm32-unknown-wasm"); + T = Triple("wasm32-unknown-unknown"); EXPECT_EQ(Triple::wasm32, T.getArch()); EXPECT_EQ(Triple::UnknownVendor, T.getVendor()); - EXPECT_EQ(Triple::WebAssembly, T.getOS()); + EXPECT_EQ(Triple::UnknownOS, T.getOS()); EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment()); - T = Triple("wasm64-unknown-wasm"); + T = Triple("wasm64-unknown-unknown"); EXPECT_EQ(Triple::wasm64, T.getArch()); EXPECT_EQ(Triple::UnknownVendor, T.getVendor()); - EXPECT_EQ(Triple::WebAssembly, T.getOS()); + EXPECT_EQ(Triple::UnknownOS, T.getOS()); EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment()); T = Triple("huh"); |
