Merge pull request #1 from rust-lang/master

updates from main

Author: Lokathor

src/math.rs

@@ -72,6 +72,7 @@ no_mangle! {
         not(target_env = "wasi")
     ),
     target_os = "xous",
+    all(target_arch = "x86_64", target_os = "uefi"),
     all(target_arch = "xtensa", target_os = "none"),
     all(target_vendor = "fortanix", target_env = "sgx")
 ))]
@@ -95,15 +96,16 @@ no_mangle! {
     fn tanf(n: f32) -> f32;
 }
 
-#[cfg(target_os = "xous")]
+#[cfg(any(target_os = "xous", target_os = "uefi"))]
 no_mangle! {
     fn sqrtf(x: f32) -> f32;
     fn sqrt(x: f64) -> f64;
 }
 
 #[cfg(any(
     all(target_vendor = "fortanix", target_env = "sgx"),
-    target_os = "xous"
+    target_os = "xous",
+    target_os = "uefi"
 ))]
 no_mangle! {
     fn ceil(x: f64) -> f64;

testcrate/tests/mem.rs

@@ -230,6 +230,8 @@ fn memmove_backward_aligned() {
     }
 }
 
+// PowerPC tests are failing: https://github.com/rust-lang/rust/issues/99853
+#[cfg(not(target_arch = "powerpc64"))]
 #[test]
 fn memset_backward_misaligned_nonaligned_start() {
     let mut arr = gen_arr::<32>();
@@ -242,6 +244,8 @@ fn memset_backward_misaligned_nonaligned_start() {
     }
 }
 
+// PowerPC tests are failing: https://github.com/rust-lang/rust/issues/99853
+#[cfg(not(target_arch = "powerpc64"))]
 #[test]
 fn memset_backward_misaligned_aligned_start() {
     let mut arr = gen_arr::<32>();
@@ -254,6 +258,8 @@ fn memset_backward_misaligned_aligned_start() {
     }
 }
 
+// PowerPC tests are failing: https://github.com/rust-lang/rust/issues/99853
+#[cfg(not(target_arch = "powerpc64"))]
 #[test]
 fn memset_backward_aligned() {
     let mut arr = gen_arr::<32>();