merged. Bruce
In message: [linux-yocto-6.16][v6.16/standard/base][PATCH v2] rust: kbuild: support `-Cjump-tables=n` for Rust 1.93.0 on 03/02/2026 [email protected] wrote: > From: Miguel Ojeda <[email protected]> > > Rust 1.93.0 (expected 2026-01-22) is stabilizing `-Zno-jump-tables` > [1][2] as `-Cjump-tables=n` [3]. > > Without this change, one would eventually see: > > RUSTC L rust/core.o > error: unknown unstable option: `no-jump-tables` > > Thus support the upcoming version. > > Link: https://github.com/rust-lang/rust/issues/116592 [1] > Link: https://github.com/rust-lang/rust/pull/105812 [2] > Link: https://github.com/rust-lang/rust/pull/145974 [3] > Reviewed-by: Alice Ryhl <[email protected]> > Reviewed-by: Trevor Gross <[email protected]> > Acked-by: Nicolas Schier <[email protected]> > Link: https://patch.msgid.link/[email protected] > Signed-off-by: Miguel Ojeda <[email protected]> > (cherry picked from commit 789521b4717fd6bd85164ba5c131f621a79c9736) > Signed-off-by: Harish Sadineni <[email protected]> > --- > arch/loongarch/Makefile | 2 +- > arch/x86/Makefile | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/loongarch/Makefile b/arch/loongarch/Makefile > index ae419e32f22e..c598515bdc76 100644 > --- a/arch/loongarch/Makefile > +++ b/arch/loongarch/Makefile > @@ -109,7 +109,7 @@ endif > ifdef CONFIG_RUSTC_HAS_ANNOTATE_TABLEJUMP > KBUILD_RUSTFLAGS += -Cllvm-args=--loongarch-annotate-tablejump > else > -KBUILD_RUSTFLAGS += -Zno-jump-tables # keep compatibility with > older compilers > +KBUILD_RUSTFLAGS += $(if $(call > rustc-min-version,109300),-Cjump-tables=n,-Zno-jump-tables) # keep > compatibility with older compilers > endif > ifdef CONFIG_LTO_CLANG > # The annotate-tablejump option can not be passed to LLVM backend when LTO > is enabled. > diff --git a/arch/x86/Makefile b/arch/x86/Makefile > index 1913d342969b..59fac654da7b 100644 > --- a/arch/x86/Makefile > +++ b/arch/x86/Makefile > @@ -109,7 +109,7 @@ ifeq ($(CONFIG_X86_KERNEL_IBT),y) > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104816 > # > KBUILD_CFLAGS += $(call cc-option,-fcf-protection=branch -fno-jump-tables) > -KBUILD_RUSTFLAGS += -Zcf-protection=branch -Zno-jump-tables > +KBUILD_RUSTFLAGS += -Zcf-protection=branch $(if $(call > rustc-min-version,109300),-Cjump-tables=n,-Zno-jump-tables) > else > KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none) > endif > -- > 2.49.0 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16281): https://lists.yoctoproject.org/g/linux-yocto/message/16281 Mute This Topic: https://lists.yoctoproject.org/mt/117630492/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
