user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust some build directives for wasm64

Browse source 
This is still an experimental target but this should get the wasm64
target to behave more like wasm32.
This commit is contained in:
Alex Crichton 2021-10-28 10:29:37 -07:00
parent 2d12d7150a
commit b7fb6c594a
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
library/compiler-builtins/build.rs
View file

@ -23,9 +23,9 @@ fn main() {
return;
}
// Forcibly enable memory intrinsics on wasm32 & SGX as we don't have a libc to
// Forcibly enable memory intrinsics on wasm & SGX as we don't have a libc to
// provide them.
if (target.contains("wasm32") && !target.contains("wasi"))
if (target.contains("wasm") && !target.contains("wasi"))
|| (target.contains("sgx") && target.contains("fortanix"))
|| target.contains("-none")
|| target.contains("nvptx")
@ -50,13 +50,13 @@ fn main() {
if !cfg!(feature = "mangled-names") && cfg!(feature = "c") {
// Don't use a C compiler for these targets:
//
// * wasm32 - clang 8 for wasm is somewhat hard to come by and it's
// * wasm - clang for wasm is somewhat hard to come by and it's
// unlikely that the C is really that much better than our own Rust.
// * nvptx - everything is bitcode, not compatible with mixed C/Rust
// * riscv - the rust-lang/rust distribution container doesn't have a C
// compiler nor is cc-rs ready for compilation to riscv (at this
// time). This can probably be removed in the future
if !target.contains("wasm32") && !target.contains("nvptx") && !target.starts_with("riscv") {
if !target.contains("wasm") && !target.contains("nvptx") && !target.starts_with("riscv") {
#[cfg(feature = "c")]
c::compile(&llvm_target, &target);
}

1
library/compiler-builtins/src/lib.rs
View file

@ -40,6 +40,7 @@ pub mod int;
#[cfg(any(
all(target_arch = "wasm32", target_os = "unknown"),
all(target_arch = "wasm64", target_os = "unknown"),
all(target_arch = "x86_64", target_os = "uefi"),
all(target_arch = "arm", target_os = "none"),
all(target_vendor = "fortanix", target_env = "sgx")

4
library/compiler-builtins/src/math.rs
View file

@ -16,7 +16,7 @@ macro_rules! no_mangle {
#[cfg(any(
all(
target_arch = "wasm32",
any(target_arch = "wasm32", target_arch = "wasm64"),
target_os = "unknown",
not(target_env = "wasi")
),
@ -66,7 +66,7 @@ no_mangle! {
#[cfg(any(
all(
target_arch = "wasm32",
any(target_arch = "wasm32", target_arch = "wasm64"),
target_os = "unknown",
not(target_env = "wasi")
),