From 744d1da1fa04c0e0168ff8fcb9e2daf65a4bdd6f Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 28 Jan 2025 03:29:27 +0100
Subject: [PATCH 1/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 0d405f532f..e548b44d8c 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-2f0ad2a71e4a4528bb80bcb24bf8fa4e50cb87c2
+2f348cb7ce4063fa4eb40038e6ada3c5214717bd

From 9ee5076618d044aff2b55edbcf933f7781f09d23 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 28 Jan 2025 03:36:45 +0100
Subject: [PATCH 2/2] linker messages are no longer warnings by default

---
 ci/ci.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ci/ci.sh b/ci/ci.sh
index fb3fc62156..5583030b49 100755
--- a/ci/ci.sh
+++ b/ci/ci.sh
@@ -14,9 +14,7 @@ function endgroup {
 begingroup "Building Miri"
 
 # Global configuration
-# We are getting some odd linker warnings on macOS, make sure they do not fail the build.
-# (See <https://github.com/rust-lang/rust/issues/136086>.)
-export RUSTFLAGS="-D warnings -A linker-messages"
+export RUSTFLAGS="-D warnings"
 export CARGO_INCREMENTAL=0
 export CARGO_EXTRA_FLAGS="--locked"