Skip to content

Commit 9299637

Browse files
author
Dan Gohman
committed
[WebAssembly] COWS has been renamed to WASI.
llvm-svn: 351297
1 parent 3d36e5c commit 9299637

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

llvm/include/llvm/ADT/Triple.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ class Triple {
186186
AMDPAL, // AMD PAL Runtime
187187
HermitCore, // HermitCore Unikernel/Multikernel
188188
Hurd, // GNU/Hurd
189-
COWS, // Capability-Oriented WebAssembly Syscalls
190-
LastOSType = COWS
189+
WASI, // Experimental WebAssembly OS
190+
LastOSType = WASI
191191
};
192192
enum EnvironmentType {
193193
UnknownEnvironment,
@@ -588,9 +588,9 @@ class Triple {
588588
return getOS() == Triple::Hurd;
589589
}
590590

591-
/// Tests whether the OS is COWS.
592-
bool isOSCOWS() const {
593-
return getOS() == Triple::COWS;
591+
/// Tests whether the OS is WASI.
592+
bool isOSWASI() const {
593+
return getOS() == Triple::WASI;
594594
}
595595

596596
/// Tests whether the OS uses glibc.

llvm/lib/Support/Triple.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ StringRef Triple::getOSTypeName(OSType Kind) {
208208
case AMDPAL: return "amdpal";
209209
case HermitCore: return "hermit";
210210
case Hurd: return "hurd";
211-
case COWS: return "cows";
211+
case WASI: return "wasi";
212212
}
213213

214214
llvm_unreachable("Invalid OSType");
@@ -506,7 +506,7 @@ static Triple::OSType parseOS(StringRef OSName) {
506506
.StartsWith("amdpal", Triple::AMDPAL)
507507
.StartsWith("hermit", Triple::HermitCore)
508508
.StartsWith("hurd", Triple::Hurd)
509-
.StartsWith("cows", Triple::COWS)
509+
.StartsWith("wasi", Triple::WASI)
510510
.Default(Triple::UnknownOS);
511511
}
512512

llvm/unittests/ADT/TripleTest.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,10 @@ TEST(TripleTest, ParsedIDs) {
253253
EXPECT_EQ(Triple::UnknownOS, T.getOS());
254254
EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
255255

256-
T = Triple("wasm32-unknown-cows-musl");
256+
T = Triple("wasm32-unknown-wasi-musl");
257257
EXPECT_EQ(Triple::wasm32, T.getArch());
258258
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
259-
EXPECT_EQ(Triple::COWS, T.getOS());
259+
EXPECT_EQ(Triple::WASI, T.getOS());
260260
EXPECT_EQ(Triple::Musl, T.getEnvironment());
261261

262262
T = Triple("wasm64-unknown-unknown");
@@ -265,10 +265,10 @@ TEST(TripleTest, ParsedIDs) {
265265
EXPECT_EQ(Triple::UnknownOS, T.getOS());
266266
EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
267267

268-
T = Triple("wasm64-unknown-cows-musl");
268+
T = Triple("wasm64-unknown-wasi-musl");
269269
EXPECT_EQ(Triple::wasm64, T.getArch());
270270
EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
271-
EXPECT_EQ(Triple::COWS, T.getOS());
271+
EXPECT_EQ(Triple::WASI, T.getOS());
272272
EXPECT_EQ(Triple::Musl, T.getEnvironment());
273273

274274
T = Triple("avr-unknown-unknown");
@@ -1247,17 +1247,17 @@ TEST(TripleTest, FileFormat) {
12471247

12481248
EXPECT_EQ(Triple::Wasm, Triple("wasm32-unknown-unknown").getObjectFormat());
12491249
EXPECT_EQ(Triple::Wasm, Triple("wasm64-unknown-unknown").getObjectFormat());
1250-
EXPECT_EQ(Triple::Wasm, Triple("wasm32-unknown-cows-musl").getObjectFormat());
1251-
EXPECT_EQ(Triple::Wasm, Triple("wasm64-unknown-cows-musl").getObjectFormat());
1250+
EXPECT_EQ(Triple::Wasm, Triple("wasm32-unknown-wasi-musl").getObjectFormat());
1251+
EXPECT_EQ(Triple::Wasm, Triple("wasm64-unknown-wasi-musl").getObjectFormat());
12521252

12531253
EXPECT_EQ(Triple::Wasm,
12541254
Triple("wasm32-unknown-unknown-wasm").getObjectFormat());
12551255
EXPECT_EQ(Triple::Wasm,
12561256
Triple("wasm64-unknown-unknown-wasm").getObjectFormat());
12571257
EXPECT_EQ(Triple::Wasm,
1258-
Triple("wasm32-unknown-cows-musl-wasm").getObjectFormat());
1258+
Triple("wasm32-unknown-wasi-musl-wasm").getObjectFormat());
12591259
EXPECT_EQ(Triple::Wasm,
1260-
Triple("wasm64-unknown-cows-musl-wasm").getObjectFormat());
1260+
Triple("wasm64-unknown-wasi-musl-wasm").getObjectFormat());
12611261

12621262
Triple MSVCNormalized(Triple::normalize("i686-pc-windows-msvc-elf"));
12631263
EXPECT_EQ(Triple::ELF, MSVCNormalized.getObjectFormat());

0 commit comments

Comments
 (0)