Skip to content

Commit 2270ec9

Browse files
committed
Auto merge of #149818 - matthiaskrgr:rollup-uw85yss, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang/rust#144938 (Enable `outline-atomics` by default on more AArch64 platforms) - rust-lang/rust#146579 (Handle macro invocation in attribute during parse) - rust-lang/rust#149400 (unstable proc_macro tracked::* rename/restructure) - rust-lang/rust#149664 (attempt to fix unreachable code regression ) - rust-lang/rust#149806 (Mirror `ubuntu:24.04` on ghcr) Failed merges: - rust-lang/rust#149789 (Cleanup in the attribute parsers) r? `@ghost` `@rustbot` modify labels: rollup
2 parents bfd7aca + 81ecfd0 commit 2270ec9

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

compiler-builtins/src/aarch64_linux.rs renamed to compiler-builtins/src/aarch64_outline_atomics.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ macro_rules! compare_and_swap {
196196
"cbnz w17, 0b",
197197
"1:",
198198
"ret",
199-
have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,
199+
have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,
200200
}
201201
}
202202
}
@@ -228,7 +228,7 @@ macro_rules! compare_and_swap_i128 {
228228
"cbnz w15, 0b",
229229
"1:",
230230
"ret",
231-
have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,
231+
have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,
232232
}
233233
}
234234
}
@@ -256,7 +256,7 @@ macro_rules! swap {
256256
concat!(stxr!($ordering, $bytes), " w17, ", reg!($bytes, 16), ", [x1]"),
257257
"cbnz w17, 0b",
258258
"ret",
259-
have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,
259+
have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,
260260
}
261261
}
262262
}
@@ -286,7 +286,7 @@ macro_rules! fetch_op {
286286
concat!(stxr!($ordering, $bytes), " w15, ", reg!($bytes, 17), ", [x1]"),
287287
"cbnz w15, 0b",
288288
"ret",
289-
have_lse = sym crate::aarch64_linux::HAVE_LSE_ATOMICS,
289+
have_lse = sym crate::aarch64_outline_atomics::HAVE_LSE_ATOMICS,
290290
}
291291
}
292292
}

compiler-builtins/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ pub mod arm;
5555
#[cfg(any(target_arch = "aarch64", target_arch = "arm64ec"))]
5656
pub mod aarch64;
5757

58-
#[cfg(all(target_arch = "aarch64", target_os = "linux"))]
59-
pub mod aarch64_linux;
58+
#[cfg(all(target_arch = "aarch64", target_feature = "outline-atomics"))]
59+
pub mod aarch64_outline_atomics;
6060

6161
#[cfg(all(
6262
kernel_user_helpers,

0 commit comments

Comments
 (0)