bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #117338 - workingjubilee:asmjs-meets-thanatos, r=b-naber

Browse source 
Remove asmjs

Fulfills [MCP 668](https://github.com/rust-lang/compiler-team/issues/668).

`asmjs-unknown-emscripten` does not work as-specified, and lacks essential upstream support for generating asm.js, so it should not exist at all.
This commit is contained in:
Matthias Krüger 2023-11-17 23:04:21 +01:00 • committed by GitHub
commit ca3a02836e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 11 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_target/src/abi/call/mod.rs
View file

@ -836,7 +836,6 @@ impl<'a, Ty> FnAbi<'a, Ty> {
wasm::compute_c_abi_info(cx, self)
}
}
"asmjs" => wasm::compute_c_abi_info(cx, self),
"bpf" => bpf::compute_abi_info(self),
arch => {
return Err(AdjustForForeignAbiError::Unsupported {

5
compiler/rustc_target/src/spec/mod.rs
View file

@ -1609,7 +1609,6 @@ supported_targets! {
("thumbv7a-pc-windows-msvc", thumbv7a_pc_windows_msvc),
("thumbv7a-uwp-windows-msvc", thumbv7a_uwp_windows_msvc),
("asmjs-unknown-emscripten", asmjs_unknown_emscripten),
("wasm32-unknown-emscripten", wasm32_unknown_emscripten),
("wasm32-unknown-unknown", wasm32_unknown_unknown),
("wasm32-wasi", wasm32_wasi),
@ -2244,10 +2243,6 @@ impl TargetOptions {
add_link_args(&mut self.pre_link_args, flavor, args);
}
fn add_post_link_args(&mut self, flavor: LinkerFlavor, args: &[&'static str]) {
add_link_args(&mut self.post_link_args, flavor, args);
}
fn update_from_cli(&mut self) {
self.linker_flavor = LinkerFlavor::from_cli_json(
self.linker_flavor_json,