From d34ceac58373e6fe4f7d02011ce152986bf1b0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcelo=20Dom=C3=ADnguez?= <dmmarcelo27@gmail.com>
Date: Mon, 17 Nov 2025 18:40:25 +0100
Subject: [PATCH 1/2] Update rustc-dev-guide

---
 src/offload/usage.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/offload/usage.md b/src/offload/usage.md
index 7abf90aa6..bcb97d134 100644
--- a/src/offload/usage.md
+++ b/src/offload/usage.md
@@ -5,6 +5,8 @@ We currently work on launching the following Rust kernel on the GPU. To follow a
 
 ```rust
 #![feature(abi_gpu_kernel)]
+#![feature(rustc_attrs)]
+#![feature(core_intrinsics)]
 #![no_std]
 
 #[cfg(target_os = "linux")]
@@ -12,6 +14,7 @@ extern crate libc;
 #[cfg(target_os = "linux")]
 use libc::c_char;
 
+#[cfg(target_os = "linux")]
 use core::mem;
 
 #[panic_handler]
@@ -38,7 +41,7 @@ fn main() {
     }
 
     unsafe {
-        kernel_1(array_c);
+        kernel(array_c);
     }
     core::hint::black_box(&array_c);
     unsafe {
@@ -52,6 +55,11 @@ fn main() {
     }
 }
 
+#[inline(never)]
+unsafe fn kernel(x: *mut [f64; 256]) {
+    core::intrinsics::offload(kernel_1, (x,))
+}
+
 #[cfg(target_os = "linux")]
 unsafe extern "C" {
     pub fn kernel_1(array_b: *mut [f64; 256]);
@@ -60,6 +68,7 @@ unsafe extern "C" {
 #[cfg(not(target_os = "linux"))]
 #[unsafe(no_mangle)]
 #[inline(never)]
+#[rustc_offload_kernel]
 pub extern "gpu-kernel" fn kernel_1(x: *mut [f64; 256]) {
     unsafe { (*x)[0] = 21.0 };
 }

From 9bea2e70288421f70cc7bba30477d2fb6c1c7a66 Mon Sep 17 00:00:00 2001
From: The rustc-josh-sync Cronjob Bot <github-actions@github.com>
Date: Thu, 27 Nov 2025 06:58:36 +0000
Subject: [PATCH 2/2] Prepare for merging from rust-lang/rust

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

diff --git a/rust-version b/rust-version
index 08324790e..bddb68a06 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-d3e1ccdf40ae7b7a6dc81edc073d80dad7b66f75
+1be6b13be73dc12e98e51b403add4c41a0b77759