From e13d480691e63d11c968535ff3bdc5707e7be42e Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Thu, 17 Oct 2024 19:02:32 +0200
Subject: [PATCH 1/2] Rename target triple to target tuple in many places in
 the compiler

This changes the naming to the new naming, used by `--print
target-tuple`.
It does not change all locations, but many.
---
 src/machine.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/machine.rs b/src/machine.rs
index 60d096b92f..50d3af8cec 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -692,7 +692,7 @@ impl<'tcx> MiriMachine<'tcx> {
             clock: Clock::new(config.isolated_op == IsolatedOp::Allow),
             #[cfg(unix)]
             native_lib: config.native_lib.as_ref().map(|lib_file_path| {
-                let target_triple = tcx.sess.opts.target_triple.triple();
+                let target_triple = tcx.sess.opts.target_triple.tuple();
                 // Check if host target == the session target.
                 if env!("TARGET") != target_triple {
                     panic!(

From 90b75dffda9d2e7996f821b0b344413c77f8d04c Mon Sep 17 00:00:00 2001
From: The Miri Cronjob Bot <miri@cron.bot>
Date: Sun, 3 Nov 2024 05:09:57 +0000
Subject: [PATCH 2/2] Preparing for merge from rustc

---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index 3ff5b22b1c..96d5acd27a 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-00ed73cdc09a6452cb58202d56a9211fb3c73031
+67395551d07b0eaf6a45ed3bf1759530ca2235d7