From f41128e42969e35438daac3c28ae8e5dfe742f32 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <contact@guillaume-gomez.fr>
Date: Thu, 9 Jul 2026 16:51:56 +0200
Subject: [PATCH 1/2] Ignore std doctests if not run on the right OS

---
 crates/core_arch/src/amdgpu/mod.rs |  8 +++----
 crates/core_arch/src/nvptx/mod.rs  |  5 ++++-
 crates/core_arch/src/x86/mod.rs    | 36 +++++++++++++++++++++++++-----
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/crates/core_arch/src/amdgpu/mod.rs b/crates/core_arch/src/amdgpu/mod.rs
index 374f582696..91dfbd1a16 100644
--- a/crates/core_arch/src/amdgpu/mod.rs
+++ b/crates/core_arch/src/amdgpu/mod.rs
@@ -351,13 +351,13 @@ pub unsafe fn sched_barrier<const MASK: u32>() {
 /// Combining multiple `sched_group_barrier` intrinsics enables an ordering of specific instruction types during instruction scheduling.
 /// For example, the following enforces a sequence of 1 VMEM read, followed by 1 VALU instruction, followed by 5 MFMA instructions.
 ///
-/// ```rust
+/// ```ignore (only available on AMD)
 /// // 1 VMEM read
-/// sched_group_barrier::<32, 1, 0>()
+/// sched_group_barrier::<32, 1, 0>();
 /// // 1 VALU
-/// sched_group_barrier::<2, 1, 0>()
+/// sched_group_barrier::<2, 1, 0>();
 /// // 5 MFMA
-/// sched_group_barrier::<8, 5, 0>()
+/// sched_group_barrier::<8, 5, 0>();
 /// ```
 ///
 #[doc = include_str!("intrinsic_is_convergent.md")]
diff --git a/crates/core_arch/src/nvptx/mod.rs b/crates/core_arch/src/nvptx/mod.rs
index d22f3a25bf..53d53d1e1e 100644
--- a/crates/core_arch/src/nvptx/mod.rs
+++ b/crates/core_arch/src/nvptx/mod.rs
@@ -157,10 +157,13 @@ unsafe extern "C" {
     /// * `format`: A pointer to the format specifier input (uses common `printf` format).
     /// * `valist`: A pointer to the valist input.
     ///
-    /// ```
+    /// ```ignore (available only for nvptx)
+    /// # use std::mem::transmute;
     /// #[repr(C)]
     /// struct PrintArgs(f32, f32, f32, i32);
     ///
+    /// let a = 0.1f32;
+    /// let b = 0.2f32;
     /// vprintf(
     ///     "int(%f + %f) = int(%f) = %d\n".as_ptr(),
     ///     transmute(&PrintArgs(a, b, a + b, (a + b) as i32)),
diff --git a/crates/core_arch/src/x86/mod.rs b/crates/core_arch/src/x86/mod.rs
index fbf1002eab..589efbcf87 100644
--- a/crates/core_arch/src/x86/mod.rs
+++ b/crates/core_arch/src/x86/mod.rs
@@ -39,7 +39,11 @@ types! {
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(any(target_arch = "x86", target_arch = "x86_64"), doc = "```")]
+    #[cfg_attr(
+        not(any(target_arch = "x86", target_arch = "x86_64")),
+        doc = "```ignore (only works on x86 targets)",
+    )]
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -82,7 +86,11 @@ types! {
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(any(target_arch = "x86", target_arch = "x86_64"), doc = "```")]
+    #[cfg_attr(
+        not(any(target_arch = "x86", target_arch = "x86_64")),
+        doc = "```ignore (only works on x86 targets)",
+    )]
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -125,7 +133,11 @@ types! {
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(any(target_arch = "x86", target_arch = "x86_64"), doc = "```")]
+    #[cfg_attr(
+        not(any(target_arch = "x86", target_arch = "x86_64")),
+        doc = "```ignore (only works on x86 targets)",
+    )]
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -172,7 +184,11 @@ types! {
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(any(target_arch = "x86", target_arch = "x86_64"), doc = "```")]
+    #[cfg_attr(
+        not(any(target_arch = "x86", target_arch = "x86_64")),
+        doc = "```ignore (only works on x86 targets)",
+    )]
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -215,7 +231,11 @@ types! {
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(any(target_arch = "x86", target_arch = "x86_64"), doc = "```")]
+    #[cfg_attr(
+        not(any(target_arch = "x86", target_arch = "x86_64")),
+        doc = "```ignore (only works on x86 targets)",
+    )]
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -258,7 +278,11 @@ types! {
     ///
     /// # Examples
     ///
-    /// ```
+    #[cfg_attr(any(target_arch = "x86", target_arch = "x86_64"), doc = "```")]
+    #[cfg_attr(
+        not(any(target_arch = "x86", target_arch = "x86_64")),
+        doc = "```ignore (only works on x86 targets)",
+    )]
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]

From f9a21bf951f24cbf5ae74cf8201ee10d858b8ba8 Mon Sep 17 00:00:00 2001
From: The rustc-josh-sync Cronjob Bot <github-actions@github.com>
Date: Thu, 6 Aug 2026 05:10:13 +0000
Subject: [PATCH 2/2] Prepare for merging from rust-lang/rust

This updates the rust-version file to f73951df0a5566d94d13b7954acd9f4ab1fa3734.
---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index 7b240b9797..8ab1fcaae5 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-fcbe7917ba18120d9eda136f1c7c5a60c78e554e
+f73951df0a5566d94d13b7954acd9f4ab1fa3734