mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove asmjs from compiler

Browse Source
This commit is contained in:
Jubilee Young 2023-10-28 23:20:55 -07:00
parent 0c1a452304
commit 208f378ef1
5 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_codegen_llvm/src/back/write.rs
View File

@ -990,11 +990,7 @@ unsafe fn embed_bitcode(
// reason (see issue #90326 for historical background). // reason (see issue #90326 for historical background).
let is_aix = target_is_aix(cgcx); let is_aix = target_is_aix(cgcx);
let is_apple = target_is_apple(cgcx); let is_apple = target_is_apple(cgcx);
if is_apple if is_apple || is_aix || cgcx.opts.target_triple.triple().starts_with("wasm") {
|| is_aix
|| cgcx.opts.target_triple.triple().starts_with("wasm")
|| cgcx.opts.target_triple.triple().starts_with("asmjs")
{
// We don't need custom section flags, create LLVM globals. // We don't need custom section flags, create LLVM globals.
let llconst = common::bytes_in_context(llcx, bitcode); let llconst = common::bytes_in_context(llcx, bitcode);
let llglobal = llvm::LLVMAddGlobal( let llglobal = llvm::LLVMAddGlobal(

6
compiler/rustc_codegen_ssa/src/back/link.rs
View File

@ -2251,9 +2251,9 @@ fn linker_with_args<'a>(
// ------------ Late order-dependent options ------------ // ------------ Late order-dependent options ------------
// Doesn't really make sense. // Doesn't really make sense.
// FIXME: In practice built-in target specs use this for arbitrary order-independent options, // FIXME: In practice built-in target specs use this for arbitrary order-independent options.
// introduce a target spec option for order-independent linker options, migrate built-in specs // Introduce a target spec option for order-independent linker options, migrate built-in specs
// to it and remove the option. // to it and remove the option. Currently the last holdout is wasm32-unknown-emscripten.
add_post_link_args(cmd, sess, flavor); add_post_link_args(cmd, sess, flavor);
Ok(cmd.take_cmd()) Ok(cmd.take_cmd())

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) wasm::compute_c_abi_info(cx, self)
} }
} }
"asmjs" => wasm::compute_c_abi_info(cx, self),
"bpf" => bpf::compute_abi_info(self), "bpf" => bpf::compute_abi_info(self),
arch => { arch => {
return Err(AdjustForForeignAbiError::Unsupported { return Err(AdjustForForeignAbiError::Unsupported {

7
compiler/rustc_target/src/spec/asmjs_unknown_emscripten.rs
View File

@ -1,7 +0,0 @@
use super::{wasm32_unknown_emscripten, LinkerFlavor, Target};
pub fn target() -> Target {
let mut target = wasm32_unknown_emscripten::target();
target.add_post_link_args(LinkerFlavor::EmCc, &["-sWASM=0", "--memory-init-file", "0"]);
target
}

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

@ -1641,7 +1641,6 @@ supported_targets! {
("thumbv7a-pc-windows-msvc", thumbv7a_pc_windows_msvc), ("thumbv7a-pc-windows-msvc", thumbv7a_pc_windows_msvc),
("thumbv7a-uwp-windows-msvc", thumbv7a_uwp_windows_msvc), ("thumbv7a-uwp-windows-msvc", thumbv7a_uwp_windows_msvc),
("asmjs-unknown-emscripten", asmjs_unknown_emscripten),
("wasm32-unknown-emscripten", wasm32_unknown_emscripten), ("wasm32-unknown-emscripten", wasm32_unknown_emscripten),
("wasm32-unknown-unknown", wasm32_unknown_unknown), ("wasm32-unknown-unknown", wasm32_unknown_unknown),
("wasm32-wasi", wasm32_wasi), ("wasm32-wasi", wasm32_wasi),
@ -2276,10 +2275,6 @@ impl TargetOptions {
add_link_args(&mut self.pre_link_args, flavor, args); 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) { fn update_from_cli(&mut self) {
self.linker_flavor = LinkerFlavor::from_cli_json( self.linker_flavor = LinkerFlavor::from_cli_json(
self.linker_flavor_json, self.linker_flavor_json,