Skip to content

microsoft/surface: add patch to handle newer rust versions #1690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
8bitbuddhist wants to merge 5 commits into
base: master
Choose a base branch
from
+43 −0
Open

microsoft/surface: add patch to handle newer rust versions #1690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19ea375
microsoft/surface: add patch to handle newer rust versions
8bitbuddhist Nov 29, 2025
ff87202
microsoft/surface: remove rust patch for 6.12 kernel
8bitbuddhist Dec 9, 2025
ee6518d
Revert "microsoft/surface: remove rust patch for 6.12 kernel"
8bitbuddhist Dec 9, 2025
e580e56
microsoft/surface: remove rust entirely for 6.12 kernel
8bitbuddhist Dec 9, 2025
4bf4cf1
Merge branch 'master' into surface-rust-target-spec-fix
8bitbuddhist Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions microsoft/surface/common/kernel/6.12/patches.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
structuredExtraConfig = with kernel; {
STAGING_MEDIA = yes;

# Disable Rust support due to conflict with 1.91 introduced in NixOS 25.11
RUST = lib.mkForce no;
RUST_IS_AVAILABLE = lib.mkForce no;
HAVE_RUST = lib.mkForce no;

##
## Surface Aggregator Module
##
Expand Down Expand Up @@ -151,4 +156,8 @@
name = "ms-surface/0014-rtc";
patch = patchSrc + "/0014-rtc.patch";
}
{
name = "rust-1.91-fix";
patch = ../rust_1-91_fix.patch;
}
]
4 changes: 4 additions & 0 deletions microsoft/surface/common/kernel/6.15/patches.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,8 @@
name = "ms-surface/0015-rtc";
patch = patchSrc + "/0015-rtc.patch";
}
{
name = "rust-1.91-fix";
patch = ../rust_1-91_fix.patch;
}
]
30 changes: 30 additions & 0 deletions microsoft/surface/common/kernel/rust_1-91_fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/scripts/generate_rust_target.rs b/scripts/generate_rust_target.rs
index 39c82908ff3a3f..38b3416bb9799e 100644
--- a/scripts/generate_rust_target.rs
+++ b/scripts/generate_rust_target.rs
@@ -225,7 +225,11 @@ fn main() {
ts.push("features", features);
ts.push("llvm-target", "x86_64-linux-gnu");
ts.push("supported-sanitizers", ["kcfi", "kernel-address"]);
- ts.push("target-pointer-width", "64");
+ if cfg.rustc_version_atleast(1, 91, 0) {
+ ts.push("target-pointer-width", 64);
+ } else {
+ ts.push("target-pointer-width", "64");
+ }
} else if cfg.has("X86_32") {
// This only works on UML, as i386 otherwise needs regparm support in rustc
if !cfg.has("UML") {
@@ -245,7 +249,11 @@ fn main() {
}
ts.push("features", features);
ts.push("llvm-target", "i386-unknown-linux-gnu");
- ts.push("target-pointer-width", "32");
+ if cfg.rustc_version_atleast(1, 91, 0) {
+ ts.push("target-pointer-width", 32);
+ } else {
+ ts.push("target-pointer-width", "32");
+ }
} else if cfg.has("LOONGARCH") {
panic!("loongarch uses the builtin rustc loongarch64-unknown-none-softfloat target");
} else {