Merge ref 'f5209000832c' from rust-lang/rust

The rustc-josh-sync Cronjob Bot · The rustc-josh-sync Cronjob Bot · commit c3dc656a1f10 · 2025-12-11T04:17:04.000Z
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: f5209000832c9d3bc29c91f4daef4ca9f28dc797 Filtered ref: 71591f7 Upstream diff: rust-lang/rust@47cd712...f520900 This merge was created using https://github.com/rust-lang/josh-sync.
diff --git a/compiler-builtins/src/aarch64_outline_atomics.rs b/compiler-builtins/src/aarch64_outline_atomics.rs
@@ -196,7 +196,7 @@ macro_rules! compare_and_swap {
                     "cbnz   w17, 0b",
                     "1:",
                     "ret",
-                    have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,
+                    have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,
                 }
             }
         }
@@ -228,7 +228,7 @@ macro_rules! compare_and_swap_i128 {
                     "cbnz   w15, 0b",
                     "1:",
                     "ret",
-                    have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,
+                    have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,
                 }
             }
         }
@@ -256,7 +256,7 @@ macro_rules! swap {
                     concat!(stxr!($ordering, $bytes), " w17, ", reg!($bytes, 16), ", [x1]"),
                     "cbnz   w17, 0b",
                     "ret",
-                    have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,
+                    have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,
                 }
             }
         }
@@ -286,7 +286,7 @@ macro_rules! fetch_op {
                     concat!(stxr!($ordering, $bytes), " w15, ", reg!($bytes, 17), ", [x1]"),
                     "cbnz  w15, 0b",
                     "ret",
-                    have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,
+                    have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,
                 }
             }
         }
diff --git a/compiler-builtins/src/lib.rs b/compiler-builtins/src/lib.rs
@@ -55,8 +55,8 @@ pub mod arm;
 #[cfg(any(target_arch = "aarch64", target_arch = "arm64ec"))]
 pub mod aarch64;
 
-#[cfg(all(target_arch = "aarch64", target_os = "linux"))]
-pub mod aarch64_linux;
+#[cfg(all(target_arch = "aarch64", target_feature = "outline-atomics"))]
+pub mod aarch64_outline_atomics;
 
 #[cfg(all(
     kernel_user_helpers,

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ macro_rules! compare_and_swap {`
`196`	`196`	`"cbnz w17, 0b",`
`197`	`197`	`"1:",`
`198`	`198`	`"ret",`
`199`		`- have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,`
	`199`	`+ have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`}`
`@@ -228,7 +228,7 @@ macro_rules! compare_and_swap_i128 {`
`228`	`228`	`"cbnz w15, 0b",`
`229`	`229`	`"1:",`
`230`	`230`	`"ret",`
`231`		`- have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,`
	`231`	`+ have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`}`
`@@ -256,7 +256,7 @@ macro_rules! swap {`
`256`	`256`	`concat!(stxr!($ordering, $bytes), " w17, ", reg!($bytes, 16), ", [x1]"),`
`257`	`257`	`"cbnz w17, 0b",`
`258`	`258`	`"ret",`
`259`		`- have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,`
	`259`	`+ have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`	`}`
`@@ -286,7 +286,7 @@ macro_rules! fetch_op {`
`286`	`286`	`concat!(stxr!($ordering, $bytes), " w15, ", reg!($bytes, 17), ", [x1]"),`
`287`	`287`	`"cbnz w15, 0b",`
`288`	`288`	`"ret",`
`289`		`- have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,`
	`289`	`+ have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`	`}`