Use more concise directives

2021-10-28 16:32:30 -07:00
parent b7fb6c594a
commit 9a01750b1b
2 changed files with 3 additions and 4 deletions
--- a/library/compiler-builtins/src/lib.rs
+++ b/library/compiler-builtins/src/lib.rs
@@ -39,8 +39,7 @@ pub mod float;
 pub mod int;

 #[cfg(any(
-    all(target_arch = "wasm32", target_os = "unknown"),
-    all(target_arch = "wasm64", target_os = "unknown"),
+    all(target_family = "wasm", 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")
--- a/library/compiler-builtins/src/math.rs
+++ b/library/compiler-builtins/src/math.rs
@@ -16,7 +16,7 @@ macro_rules! no_mangle {

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

 #[cfg(any(
    all(
-        any(target_arch = "wasm32", target_arch = "wasm64"),
+        target_family = "wasm",
        target_os = "unknown",
        not(target_env = "wasi")
    ),