On Tue, Feb 3, 2026 at 3:47 AM <[email protected]> wrote:
> From: Harish Sadineni <[email protected]> > > Rust 1.93.0 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: rust-lang/rust#116592 [1] > Link: rust-lang/rust#105812 [2] > Link: rust-lang/rust#145974 [3] > Link: https://patch.msgid.link/[email protected] > > Upstream-Status: Backport [ > https://github.com/torvalds/linux/commit/789521b4717fd6bd85164ba5c131f621a79c9736 > ] > Don't use the Upstream-Status tag for the kernel patches. Just follow kernel convention and indicate that it is a cherry pick of commit <> Bruce > 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 > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16266): https://lists.yoctoproject.org/g/linux-yocto/message/16266 Mute This Topic: https://lists.yoctoproject.org/mt/117612949/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
