public inbox for rust-for-linux@vger.kernel.org
 help / color / mirror / Atom feed
From: HeeSu Kim <mlksvender@gmail.com>
To: ojeda@kernel.org
Cc: gary@garyguo.net, charmitro@posteo.net, a.hindborg@kernel.org,
	aliceryhl@google.com, bjorn3_gh@protonmail.com, boqun@google.com,
	dakr@kernel.org, lossin@kernel.org, tmgross@umich.edu,
	rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
	HeeSu Kim <mlksvender@gmail.com>
Subject: [PATCH v2] rust: Makefile: bound rustdoc workaround to affected versions
Date: Tue,  3 Feb 2026 09:21:16 +0900	[thread overview]
Message-ID: <20260203002116.2703251-1-mlksvender@gmail.com> (raw)
In-Reply-To: <20260202222144.2689495-1-mlksvender@gmail.com>

The `-Cunsafe-allow-abi-mismatch=fixed-x18` workaround was added to
handle a rustdoc bug (rust-lang/rust#144521) where target modifiers
were not properly saved.

This bug was fixed in Rust 1.90.0 (rust-lang/rust#144523). Restrict
the workaround to only apply for Rust 1.88.x and 1.89.x versions that
are affected by the bug, avoiding unnecessary flags on newer compiler
versions.

Suggested-by: Gary Guo <gary@garyguo.net>
Fixes: abbf9a449441 ("rust: workaround `rustdoc` target modifiers bug")
Signed-off-by: HeeSu Kim <mlksvender@gmail.com>
---
 rust/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rust/Makefile b/rust/Makefile
index 5c0155b83454..55e2dc865207 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -136,7 +136,8 @@ pin_init-flags := \
 
 # `rustdoc` did not save the target modifiers, thus workaround for
 # the time being (https://github.com/rust-lang/rust/issues/144521).
-rustdoc_modifiers_workaround := $(if $(call rustc-min-version,108800),-Cunsafe-allow-abi-mismatch=fixed-x18)
+# The bug was fixed in Rust 1.90.0, so only apply for 1.88.x and 1.89.x.
+rustdoc_modifiers_workaround := $(if $(call rustc-min-version,108800),$(if $(call test-lt,$(CONFIG_RUSTC_VERSION),109000),-Cunsafe-allow-abi-mismatch=fixed-x18))
 
 # Similarly, for doctests (https://github.com/rust-lang/rust/issues/146465).
 doctests_modifiers_workaround := $(rustdoc_modifiers_workaround)$(if $(call rustc-min-version,109100),$(comma)sanitizer)
-- 
2.52.0


  parent reply	other threads:[~2026-02-02 15:21 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-02 22:21 [PATCH] rust: Makefile: apply fixed-x18 workaround only on arm64 HeeSu Kim
2026-02-02 13:59 ` Charalampos Mitrodimas
2026-02-02 23:17   ` HeeSu Kim
2026-02-02 14:20 ` Miguel Ojeda
2026-02-02 14:24 ` Gary Guo
2026-02-02 23:45   ` HeeSu Kim
2026-02-03  0:21 ` HeeSu Kim [this message]
2026-02-02 16:00   ` [PATCH v2] rust: Makefile: bound rustdoc workaround to affected versions Miguel Ojeda
2026-02-03  0:56     ` Nathan Chancellor
2026-02-03 23:48       ` [PATCH v4] " HeeSu Kim
2026-02-03 22:12         ` Nathan Chancellor
2026-02-05 13:15           ` HeeSu Kim
2026-02-05 13:18           ` [PATCH v5 1/2] kbuild: add rustc-max-version macro HeeSu Kim
2026-02-05 13:18             ` [PATCH v5 2/2] rust: Makefile: bound rustdoc workaround to affected versions HeeSu Kim
2026-03-12 14:12               ` Miguel Ojeda
2026-02-05 15:55             ` [PATCH v5 1/2] kbuild: add rustc-max-version macro Nicolas Schier
2026-03-10 22:45               ` Miguel Ojeda
2026-02-03  1:46     ` [PATCH v2] rust: Makefile: bound rustdoc workaround to affected versions HeeSu Kim
2026-02-03  9:17     ` [PATCH v3] " HeeSu Kim
2026-02-03 14:56     ` [PATCH v2] " Gary Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260203002116.2703251-1-mlksvender@gmail.com \
    --to=mlksvender@gmail.com \
    --cc=a.hindborg@kernel.org \
    --cc=aliceryhl@google.com \
    --cc=bjorn3_gh@protonmail.com \
    --cc=boqun@google.com \
    --cc=charmitro@posteo.net \
    --cc=dakr@kernel.org \
    --cc=gary@garyguo.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lossin@kernel.org \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=tmgross@umich.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox