Skip to content

Commit db5f705

Browse files
ojedaintel-lab-lkp
authored andcommitted
rust: workaround rustdoc target modifiers bug
Starting with Rust 1.88.0 (released 2025-06-26), `rustdoc` complains about a target modifier mismatch in configurations where `-Zfixed-x18` is passed: error: mixing `-Zfixed-x18` will cause an ABI mismatch in crate `rust_out` | = help: the `-Zfixed-x18` flag modifies the ABI so Rust crates compiled with different values of this flag cannot be used together safely = note: unset `-Zfixed-x18` in this crate is incompatible with `-Zfixed-x18=` in dependency `core` = help: set `-Zfixed-x18=` in this crate or unset `-Zfixed-x18` in `core` = help: if you are sure this will not cause problems, you may use `-Cunsafe-allow-abi-mismatch=fixed-x18` to silence this error The reason is that `rustdoc` was not passing the target modifiers when configuring the session options, and thus it would report a mismatch that did not exist as soon as a target modifier is used in a dependency. We did not notice it in the kernel until now because `-Zfixed-x18` has been a target modifier only since 1.88.0 (and it is the only one we use so far). The issue has been reported upstream [1] and a fix has been submitted [2], including a test similar to the kernel case. Meanwhile, conditionally pass `-Cunsafe-allow-abi-mismatch=fixed-x18` to workaround the issue on our side. Reported-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Closes: https://lore.kernel.org/rust-for-linux/36cdc798-524f-4910-8b77-d7b9fac08d77@oss.qualcomm.com/ Link: rust-lang/rust#144521 [1] Link: rust-lang/rust#144523 [2] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent 89be9a8 commit db5f705

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

rust/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ core-cfgs = \
6262

6363
core-edition := $(if $(call rustc-min-version,108700),2024,2021)
6464

65+
# `rustdoc` did not save the target modifiers, thus workaround for
66+
# the time being (https://github.com/rust-lang/rust/issues/144521).
67+
rustdoc_modifiers_workaround := $(if $(call rustc-min-version,108800),-Cunsafe-allow-abi-mismatch=fixed-x18)
68+
6569
# `rustc` recognizes `--remap-path-prefix` since 1.26.0, but `rustdoc` only
6670
# since Rust 1.81.0. Moreover, `rustdoc` ICEs on out-of-tree builds since Rust
6771
# 1.82.0 (https://github.com/rust-lang/rust/issues/138520). Thus workaround both
@@ -74,6 +78,7 @@ quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $<
7478
-Zunstable-options --generate-link-to-definition \
7579
--output $(rustdoc_output) \
7680
--crate-name $(subst rustdoc-,,$@) \
81+
$(rustdoc_modifiers_workaround) \
7782
$(if $(rustdoc_host),,--sysroot=/dev/null) \
7883
@$(objtree)/include/generated/rustc_cfg $<
7984

@@ -212,6 +217,7 @@ quiet_cmd_rustdoc_test_kernel = RUSTDOC TK $<
212217
--extern bindings --extern uapi \
213218
--no-run --crate-name kernel -Zunstable-options \
214219
--sysroot=/dev/null \
220+
$(rustdoc_modifiers_workaround) \
215221
--test-builder $(objtree)/scripts/rustdoc_test_builder \
216222
$< $(rustdoc_test_kernel_quiet); \
217223
$(objtree)/scripts/rustdoc_test_gen

0 commit comments

Comments
 (0)