Skip to content

[WASM] Add minimal support for targeting wasm32-unknown-unknown-wasm. Forked #20684 #27860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

[WASM] Add minimal support for targeting wasm32-unknown-unknown-wasm. Forked #20684 #27860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a525475
[WASM] Add minimal support for targeting wasm32-unknown-unknown-wasm.
ddunbar Nov 20, 2018
adb0bfb
[WASM] Adding a test case to ensure that swiftc accepts WASM targets
kateinoigakukun Oct 24, 2019
92f1caa
[WASM] Use WASI as a target OS instead of none OS
kateinoigakukun Dec 3, 2019
4f82512
[WASM] Fix test case for WASI
kateinoigakukun Dec 3, 2019
74119fb
Merge branch 'master' into katei/swasm-minimal-triple-support
kateinoigakukun Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions lib/Basic/LangOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,9 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
case llvm::Triple::Haiku:
addPlatformConditionValue(PlatformConditionKind::OS, "Haiku");
break;
case llvm::Triple::WASI:
addPlatformConditionValue(PlatformConditionKind::OS, "WASI");
break;
default:
UnsupportedOS = true;
break;
Expand Down Expand Up @@ -277,6 +280,12 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
case llvm::Triple::ArchType::systemz:
addPlatformConditionValue(PlatformConditionKind::Arch, "s390x");
break;
case llvm::Triple::ArchType::wasm32:
addPlatformConditionValue(PlatformConditionKind::Arch, "wasm32");
break;
case llvm::Triple::ArchType::wasm64:
addPlatformConditionValue(PlatformConditionKind::Arch, "wasm64");
break;
default:
UnsupportedArch = true;
}
Expand All @@ -293,6 +302,8 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
case llvm::Triple::ArchType::ppc64le:
case llvm::Triple::ArchType::x86:
case llvm::Triple::ArchType::x86_64:
case llvm::Triple::ArchType::wasm32:
case llvm::Triple::ArchType::wasm64:
addPlatformConditionValue(PlatformConditionKind::Endianness, "little");
break;
case llvm::Triple::ArchType::ppc64:
Expand Down
4 changes: 2 additions & 2 deletions lib/Basic/Platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
case llvm::Triple::AMDPAL:
case llvm::Triple::HermitCore:
case llvm::Triple::Hurd:
case llvm::Triple::WASI:
return "";
case llvm::Triple::Darwin:
case llvm::Triple::MacOSX:
case llvm::Triple::IOS:
Expand All @@ -191,6 +189,8 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
return "ps4";
case llvm::Triple::Haiku:
return "haiku";
case llvm::Triple::WASI:
return "wasi";
}
llvm_unreachable("unsupported OS");
}
Expand Down
2 changes: 2 additions & 0 deletions lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ Driver::buildToolChain(const llvm::opt::InputArgList &ArgList) {
return llvm::make_unique<toolchains::Windows>(*this, target);
case llvm::Triple::Haiku:
return llvm::make_unique<toolchains::GenericUnix>(*this, target);
case llvm::Triple::WASI:
return llvm::make_unique<toolchains::GenericUnix>(*this, target);
default:
Diags.diagnose(SourceLoc(), diag::error_unknown_target,
ArgList.getLastArg(options::OPT_target)->getValue());
Expand Down
3 changes: 3 additions & 0 deletions test/Driver/Inputs/wasm.sdk/usr/lib/swift/wasi/wasm32/Swift.swiftinterface
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// swift-interface-format-version: 1.0
// swift-module-flags: -target wasm32-unknown-wasi -disable-objc-interop -swift-version 5 -O -module-name Swift -parse-stdlib

3 changes: 3 additions & 0 deletions test/Driver/Inputs/wasm.sdk/usr/lib/swift/wasi/wasm64/Swift.swiftinterface
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// swift-interface-format-version: 1.0
// swift-module-flags: -target wasm64-unknown-wasi -disable-objc-interop -swift-version 5 -O -module-name Swift -parse-stdlib

2 changes: 2 additions & 0 deletions test/Driver/target-triple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// RUN: %swiftc_driver -target wasm32-unknown-wasi -sdk %S/Inputs/wasm.sdk -typecheck %s
// RUN: %swiftc_driver -target wasm64-unknown-wasi -sdk %S/Inputs/wasm.sdk -typecheck %s