Skip to content

Commit 4ce5ac8

Browse files
committed
Auto merge of #148818 - Zalathar:rollup-4vujcg0, r=Zalathar
Rollup of 13 pull requests Successful merges: - rust-lang/rust#148694 (std: support `RwLock` and thread parking on TEEOS) - rust-lang/rust#148712 (Port `cfg_select!` to the new attribute parsing system) - rust-lang/rust#148760 (rustc_target: hide TargetOptions::vendor) - rust-lang/rust#148771 (IAT: Reinstate early bailout) - rust-lang/rust#148775 (Fix a typo in the documentation for the strict_shr function) - rust-lang/rust#148779 (Implement DynSend and DynSync for std::panic::Location.) - rust-lang/rust#148781 ([rustdoc] Remove unneeded `allow(rustc::potential_query_instability)`) - rust-lang/rust#148783 (add test for assoc type norm wf check) - rust-lang/rust#148785 (Replace `master` branch references with `main`) - rust-lang/rust#148791 (fix "is_closure_like" doc comment) - rust-lang/rust#148792 (Prefer to use file.stable_id over file.name from source map) - rust-lang/rust#148805 (rustc-dev-guide subtree update) - rust-lang/rust#148807 (Document (and test) a problem with `Clone`/`Copy` deriving.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3f4f55a + a7d08da commit 4ce5ac8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/machine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ impl<'tcx> MiriMachine<'tcx> {
715715
match target.arch {
716716
Arch::Wasm32 | Arch::Wasm64 => 64 * 1024, // https://webassembly.github.io/spec/core/exec/runtime.html#memory-instances
717717
Arch::AArch64 => {
718-
if target.options.vendor.as_ref() == "apple" {
718+
if target.is_like_darwin {
719719
// No "definitive" source, but see:
720720
// https://www.wwdcnotes.com/notes/wwdc20/10214/
721721
// https://github.com/ziglang/zig/issues/11308 etc.

0 commit comments

Comments
 (0)