diff --git a/src/math.rs b/src/math.rs
index 63d85833..d77cf51a 100644
--- a/src/math.rs
+++ b/src/math.rs
@@ -23,7 +23,7 @@ macro_rules! no_mangle {
     ),
     target_os = "xous",
     target_os = "uefi",
-    all(target_arch = "xtensa", target_os = "none"),
+    target_os = "none",
     all(target_vendor = "fortanix", target_env = "sgx")
 ))]
 no_mangle! {
@@ -95,7 +95,7 @@ no_mangle! {
     ),
     target_os = "xous",
     target_os = "uefi",
-    all(target_arch = "xtensa", target_os = "none"),
+    target_os = "none",
     all(target_vendor = "fortanix", target_env = "sgx"),
     target_os = "windows"
 ))]
@@ -113,11 +113,7 @@ intrinsics! {
     }
 }
 
-#[cfg(any(
-    target_os = "xous",
-    target_os = "uefi",
-    all(target_arch = "xtensa", target_os = "none"),
-))]
+#[cfg(any(target_os = "xous", target_os = "uefi", target_os = "none",))]
 no_mangle! {
     fn sqrtf(x: f32) -> f32;
     fn sqrt(x: f64) -> f64;
@@ -125,7 +121,7 @@ no_mangle! {
 
 #[cfg(any(
     all(target_vendor = "fortanix", target_env = "sgx"),
-    all(target_arch = "xtensa", target_os = "none"),
+    target_os = "none",
     target_os = "xous",
     target_os = "uefi"
 ))]