From: HeeSu Kim <mlksvender@gmail.com>
To: miguel.ojeda.sandonis@gmail.com
Cc: a.hindborg@kernel.org, aliceryhl@google.com,
bjorn3_gh@protonmail.com, boqun@google.com, charmitro@posteo.net,
dakr@kernel.org, gary@garyguo.net, linux-kbuild@vger.kernel.org,
linux-kernel@vger.kernel.org, lossin@kernel.org,
mlksvender@gmail.com, nathan@kernel.org, nsc@kernel.org,
ojeda@kernel.org, rust-for-linux@vger.kernel.org,
stable@vger.kernel.org, tmgross@umich.edu
Subject: [PATCH v6 0/2] rust: Makefile: bound rustdoc workaround to affected versions
Date: Sun, 19 Apr 2026 23:05:52 +0900 [thread overview]
Message-ID: <cover.1776607331.git.mlksvender@gmail.com> (raw)
In-Reply-To: <CANiq72nnuKJaKrxrut6+noR13PUiSoWWyyp-pGx-fe_2O6ayFA@mail.gmail.com>
This series bounds the `-Cunsafe-allow-abi-mismatch=fixed-x18` workaround
in `rust/Makefile` to the compiler versions that are actually affected by
the rustdoc (#144521, fixed in 1.90.0) and doctests (#146465, fixed in
1.92.0) target-modifier bugs, so that ABI compatibility checks run again
on newer toolchains.
Changes since v5 [1] [2]:
- Patch 1/2 is v5 1/2 renamed from `rustc-max-version` to
`rustc-lt-version` per Miguel's plan to rename on apply [3] and to
avoid the `99` form. Nathan's [4] and Nicolas' [5] Acked-bys from
v5 1/2 are carried over as Miguel indicated they would be preserved
through the rename.
- Patch 2/2 reworks v5 2/2 to fix the doctests case that Miguel
pointed out [6]: the v5 form reused `$(rustdoc_modifiers_workaround)`
as a prefix, so on rustc >= 1.91 the doctests variable expanded to
a stray `,sanitizer`. Use Miguel's suggested explicit
`ifeq`/`else ifeq` layout with `rustc-min-version` +
`rustc-lt-version` combined inline, so each affected range is
visible on its own line.
The `rustc-version-range` macro Miguel mentioned as an "improvement on
top" [3] is intentionally left out of this series; I will send it as a
separate follow-up patch once this lands, as Miguel suggested.
Tested by building `make rustdoc` and `make rusttest` on rustc 1.93.0:
both succeed with the workaround disabled (empty expansion), confirming
the bugs really are fixed in 1.92+ and no regressions are introduced.
Macro expansion was also spot-checked across simulated rustc versions
1.87 through 1.93 to verify each range matches the expected flag value.
[1] https://lore.kernel.org/rust-for-linux/20260205131522.2942928-1-mlksvender@gmail.com/
[2] https://lore.kernel.org/rust-for-linux/20260205131815.2943152-2-mlksvender@gmail.com/
[3] https://lore.kernel.org/rust-for-linux/CANiq72n-z0v_deUVPWeg1h0c6KQ+r6xfNDf72o29_0yy6KbqGA@mail.gmail.com/
[4] https://lore.kernel.org/rust-for-linux/20260203221224.GA2703490@ax162/
[5] https://lore.kernel.org/rust-for-linux/aYS9bRugxr1rUvA3@levanger/
[6] https://lore.kernel.org/rust-for-linux/CANiq72nnuKJaKrxrut6+noR13PUiSoWWyyp-pGx-fe_2O6ayFA@mail.gmail.com/
HeeSu Kim (2):
kbuild: add rustc-lt-version macro
rust: Makefile: bound rustdoc workaround to affected versions
rust/Makefile | 18 ++++++++++++------
scripts/Makefile.compiler | 4 ++++
2 files changed, 16 insertions(+), 6 deletions(-)
--
2.52.0
WARNING: multiple messages have this Message-ID (diff)
From: HeeSu Kim <mlksvender@gmail.com>
To: miguel.ojeda.sandonis@gmail.com
Cc: a.hindborg@kernel.org, aliceryhl@google.com,
bjorn3_gh@protonmail.com, boqun@google.com, charmitro@posteo.net,
dakr@kernel.org, gary@garyguo.net, linux-kbuild@vger.kernel.org,
linux-kernel@vger.kernel.org, lossin@kernel.org,
mlksvender@gmail.com, nathan@kernel.org, nsc@kernel.org,
ojeda@kernel.org, rust-for-linux@vger.kernel.org,
stable@vger.kernel.org, tmgross@umich.edu
Subject: [PATCH v6 0/2] rust: Makefile: bound rustdoc workaround to affected versions
Date: Sun, 19 Apr 2026 23:06:11 +0900 [thread overview]
Message-ID: <cover.1776607331.git.mlksvender@gmail.com> (raw)
Message-ID: <20260419140611.MNRDDx-MquqrXOCfyIxnilRgBh_JE8sZaFPvSNqmkLk@z> (raw)
In-Reply-To: <CANiq72nnuKJaKrxrut6+noR13PUiSoWWyyp-pGx-fe_2O6ayFA@mail.gmail.com>
This series bounds the `-Cunsafe-allow-abi-mismatch=fixed-x18` workaround
in `rust/Makefile` to the compiler versions that are actually affected by
the rustdoc (#144521, fixed in 1.90.0) and doctests (#146465, fixed in
1.92.0) target-modifier bugs, so that ABI compatibility checks run again
on newer toolchains.
Changes since v5 [1] [2]:
- Patch 1/2 is v5 1/2 renamed from `rustc-max-version` to
`rustc-lt-version` per Miguel's plan to rename on apply [3] and to
avoid the `99` form. Nathan's [4] and Nicolas' [5] Acked-bys from
v5 1/2 are carried over as Miguel indicated they would be preserved
through the rename.
- Patch 2/2 reworks v5 2/2 to fix the doctests case that Miguel
pointed out [6]: the v5 form reused `$(rustdoc_modifiers_workaround)`
as a prefix, so on rustc >= 1.91 the doctests variable expanded to
a stray `,sanitizer`. Use Miguel's suggested explicit
`ifeq`/`else ifeq` layout with `rustc-min-version` +
`rustc-lt-version` combined inline, so each affected range is
visible on its own line.
The `rustc-version-range` macro Miguel mentioned as an "improvement on
top" [3] is intentionally left out of this series; I will send it as a
separate follow-up patch once this lands, as Miguel suggested.
Tested by building `make rustdoc` and `make rusttest` on rustc 1.93.0:
both succeed with the workaround disabled (empty expansion), confirming
the bugs really are fixed in 1.92+ and no regressions are introduced.
Macro expansion was also spot-checked across simulated rustc versions
1.87 through 1.93 to verify each range matches the expected flag value.
[1] https://lore.kernel.org/rust-for-linux/20260205131522.2942928-1-mlksvender@gmail.com/
[2] https://lore.kernel.org/rust-for-linux/20260205131815.2943152-2-mlksvender@gmail.com/
[3] https://lore.kernel.org/rust-for-linux/CANiq72n-z0v_deUVPWeg1h0c6KQ+r6xfNDf72o29_0yy6KbqGA@mail.gmail.com/
[4] https://lore.kernel.org/rust-for-linux/20260203221224.GA2703490@ax162/
[5] https://lore.kernel.org/rust-for-linux/aYS9bRugxr1rUvA3@levanger/
[6] https://lore.kernel.org/rust-for-linux/CANiq72nnuKJaKrxrut6+noR13PUiSoWWyyp-pGx-fe_2O6ayFA@mail.gmail.com/
HeeSu Kim (2):
kbuild: add rustc-lt-version macro
rust: Makefile: bound rustdoc workaround to affected versions
rust/Makefile | 18 ++++++++++++------
scripts/Makefile.compiler | 4 ++++
2 files changed, 16 insertions(+), 6 deletions(-)
--
2.52.0
next prev parent reply other threads:[~2026-04-19 14:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20260202222144.2689495-1-mlksvender@gmail.com>
[not found] ` <20260203002116.2703251-1-mlksvender@gmail.com>
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: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-04-19 14:05 ` HeeSu Kim [this message]
2026-04-19 14:05 ` [PATCH v6 1/2] kbuild: add rustc-lt-version macro HeeSu Kim
2026-04-19 14:06 ` HeeSu Kim
2026-04-19 14:05 ` [PATCH v6 2/2] rust: Makefile: bound rustdoc workaround to affected versions HeeSu Kim
2026-04-19 14:06 ` HeeSu Kim
2026-04-19 14:06 ` [PATCH v6 0/2] " HeeSu Kim
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=cover.1776607331.git.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-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=nathan@kernel.org \
--cc=nsc@kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=stable@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