diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-04-05 00:24:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-05 00:24:23 +0200 |
| commit | 0d12422f2d82e4ec47d4b85660caed70b78ea44c (patch) | |
| tree | a5c03caf548a3ab25207c025e67c238ed9a57e3a /compiler/rustc_codegen_ssa | |
| parent | 8ad6a443cfee83e1f7d29c9ec0de26143c54a617 (diff) | |
| parent | da66a31572e0f49981d6b958ecdd95397ecf2d3f (diff) | |
| download | rust-0d12422f2d82e4ec47d4b85660caed70b78ea44c.tar.gz rust-0d12422f2d82e4ec47d4b85660caed70b78ea44c.zip | |
Rollup merge of #80525 - devsnek:wasm64, r=nagisa
wasm64 support There is still some upstream llvm work needed before this can land.
Diffstat (limited to 'compiler/rustc_codegen_ssa')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/linker.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/target_features.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs index e19274e579b..77d8ab49ff2 100644 --- a/compiler/rustc_codegen_ssa/src/back/linker.rs +++ b/compiler/rustc_codegen_ssa/src/back/linker.rs @@ -186,7 +186,7 @@ impl<'a> GccLinker<'a> { // * On OSX they have their own linker, not binutils' // * For WebAssembly the only functional linker is LLD, which doesn't // support hint flags - !self.sess.target.is_like_osx && self.sess.target.arch != "wasm32" + !self.sess.target.is_like_osx && !self.sess.target.is_like_wasm } // Some platforms take hints about whether a library is static or dynamic. diff --git a/compiler/rustc_codegen_ssa/src/target_features.rs b/compiler/rustc_codegen_ssa/src/target_features.rs index a69e6d2b86d..4e987908b4e 100644 --- a/compiler/rustc_codegen_ssa/src/target_features.rs +++ b/compiler/rustc_codegen_ssa/src/target_features.rs @@ -161,7 +161,7 @@ pub fn supported_target_features(sess: &Session) -> &'static [(&'static str, Opt "mips" | "mips64" => MIPS_ALLOWED_FEATURES, "powerpc" | "powerpc64" => POWERPC_ALLOWED_FEATURES, "riscv32" | "riscv64" => RISCV_ALLOWED_FEATURES, - "wasm32" => WASM_ALLOWED_FEATURES, + "wasm32" | "wasm64" => WASM_ALLOWED_FEATURES, _ => &[], } } |