squash! fix wasi
This commit is contained in:
parent
8f64cec022
commit
5ba3be1d60
|
@ -605,10 +605,11 @@ impl<'a, Ty> FnAbi<'a, Ty> {
|
|||
"nvptx64" => nvptx64::compute_abi_info(self),
|
||||
"hexagon" => hexagon::compute_abi_info(self),
|
||||
"riscv32" | "riscv64" => riscv::compute_abi_info(cx, self),
|
||||
"wasm32" if cx.target_spec().os == "bindgen" => {
|
||||
wasm32_bindgen_compat::compute_abi_info(self)
|
||||
}
|
||||
"wasm32" | "asmjs" => wasm32::compute_abi_info(cx, self),
|
||||
"wasm32" => match cx.target_spec().os.as_str() {
|
||||
"emscripten" | "wasi" => wasm32::compute_abi_info(cx, self),
|
||||
_ => wasm32_bindgen_compat::compute_abi_info(self),
|
||||
},
|
||||
"asmjs" => wasm32::compute_abi_info(cx, self),
|
||||
a => return Err(format!("unrecognized arch \"{}\" in target specification", a)),
|
||||
}
|
||||
|
||||
|
|
|
@ -613,7 +613,6 @@ supported_targets! {
|
|||
("thumbv7a-uwp-windows-msvc", thumbv7a_uwp_windows_msvc),
|
||||
|
||||
("asmjs-unknown-emscripten", asmjs_unknown_emscripten),
|
||||
("wasm32-unknown-bindgen", wasm32_unknown_bindgen),
|
||||
("wasm32-unknown-emscripten", wasm32_unknown_emscripten),
|
||||
("wasm32-unknown-unknown", wasm32_unknown_unknown),
|
||||
("wasm32-wasi", wasm32_wasi),
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
//! This target is a variant of `wasm32-unknown-unknown` which uses the bindgen
|
||||
//! ABI instead of the normal ABI.
|
||||
use super::{wasm32_unknown_unknown, Target};
|
||||
|
||||
pub fn target() -> Target {
|
||||
let mut target = wasm32_unknown_unknown::target();
|
||||
target.options.os = "bindgen".to_string();
|
||||
target
|
||||
}
|
|
@ -126,7 +126,6 @@ target | std | host | notes
|
|||
`thumbv8m.base-none-eabi` | * | | ARMv8-M Baseline
|
||||
`thumbv8m.main-none-eabi` | * | | ARMv8-M Mainline
|
||||
`thumbv8m.main-none-eabihf` | * | | ARMv8-M Mainline, hardfloat
|
||||
`wasm32-unknown-bindgen` | ✓ | | WebAssembly via wasm-bindgen
|
||||
`wasm32-unknown-emscripten` | ✓ | | WebAssembly via Emscripten
|
||||
`wasm32-unknown-unknown` | ✓ | | WebAssembly
|
||||
`wasm32-wasi` | ✓ | | WebAssembly with WASI
|
||||
|
|
Loading…
Reference in New Issue