Commit 60cb1da6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rust-fixes-6.11' of https://github.com/Rust-for-Linux/linux 

Pull rust fixes from Miguel Ojeda:

 - Fix '-Os' Rust 1.80.0+ builds adding more intrinsics (also tweaked in
   upstream Rust for the upcoming 1.82.0).

 - Fix support for the latest version of rust-analyzer due to a change
   on rust-analyzer config file semantics (considered a fix since most
   developers use the latest version of the tool, which is the only one
   actually supported by upstream). I am discussing stability of the
   config file with upstream -- they may be able to start versioning it.

 - Fix GCC 14 builds due to '-fmin-function-alignment' not skipped for
   libclang (bindgen).

 - A couple Kconfig fixes around '{RUSTC,BINDGEN}_VERSION_TEXT' to
   suppress error messages in a foreign architecture chroot and to use a
   proper default format.

 - Clean 'rust-analyzer' target warning due to missing recursive make
   invocation mark.

 - Clean Clippy warning due to missing indentation in docs.

 - Clean LLVM 19 build warning due to removed 3dnow feature upstream.

* tag 'rust-fixes-6.11' of https://github.com/Rust-for-Linux/linux:
  rust: x86: remove `-3dnow{,a}` from target features
  kbuild: rust-analyzer: mark `rust_is_available.sh` invocation as recursive
  rust: add intrinsics to fix `-Os` builds
  kbuild: rust: skip -fmin-function-alignment in bindgen flags
  rust: Support latest version of `rust-analyzer`
  rust: macros: indent list item in `module!`'s docs
  rust: fix the default format for CONFIG_{RUSTC,BINDGEN}_VERSION_TEXT
  rust: suppress error messages from CONFIG_{RUSTC,BINDGEN}_VERSION_TEXT
parents 5b179fe0 0eba65f0

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1963,7 +1963,7 @@ tags TAGS cscope gtags: FORCE 
# Protocol).

PHONY += rust-analyzer

rust-analyzer:

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh

	+$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh

	$(Q)$(MAKE) $(build)=rust $@



# Script to generate missing namespace dependencies

init/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1920,7 +1920,7 @@ config RUST 
config RUSTC_VERSION_TEXT

	string

	depends on RUST

	default $(shell,command -v $(RUSTC) >/dev/null 2>&1 && $(RUSTC) --version || echo n)

	default "$(shell,$(RUSTC) --version 2>/dev/null)"



config BINDGEN_VERSION_TEXT

	string
@@ -1928,7 +1928,7 @@ config BINDGEN_VERSION_TEXT 
	# The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0

	# (https://github.com/rust-lang/rust-bindgen/pull/2678). It can be removed when

	# the minimum version is upgraded past that (0.69.1 already fixed the issue).

	default $(shell,command -v $(BINDGEN) >/dev/null 2>&1 && $(BINDGEN) --version workaround-for-0.69.0 || echo n)

	default "$(shell,$(BINDGEN) --version workaround-for-0.69.0 2>/dev/null)"



#

# Place an empty function call at each tracepoint site. Can be

rust/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ bindgen_skip_c_flags := -mno-fp-ret-in-387 -mpreferred-stack-boundary=% \ 
	-fno-reorder-blocks -fno-allow-store-data-races -fasan-shadow-offset=% \

	-fzero-call-used-regs=% -fno-stack-clash-protection \

	-fno-inline-functions-called-once -fsanitize=bounds-strict \

	-fstrict-flex-arrays=% \

	-fstrict-flex-arrays=% -fmin-function-alignment=% \

	--param=% --param asan-%



# Derived from `scripts/Makefile.clang`.
@@ -350,12 +350,12 @@ rust-analyzer: 
	$(Q)$(srctree)/scripts/generate_rust_analyzer.py \

		--cfgs='core=$(core-cfgs)' --cfgs='alloc=$(alloc-cfgs)' \

		$(realpath $(srctree)) $(realpath $(objtree)) \

		$(RUST_LIB_SRC) $(KBUILD_EXTMOD) > \

		$(rustc_sysroot) $(RUST_LIB_SRC) $(KBUILD_EXTMOD) > \

		$(if $(KBUILD_EXTMOD),$(extmod_prefix),$(objtree))/rust-project.json



redirect-intrinsics = \

	__addsf3 __eqsf2 __gesf2 __lesf2 __ltsf2 __mulsf3 __nesf2 __unordsf2 \

	__adddf3 __ledf2 __ltdf2 __muldf3 __unorddf2 \

	__addsf3 __eqsf2 __extendsfdf2 __gesf2 __lesf2 __ltsf2 __mulsf3 __nesf2 __truncdfsf2 __unordsf2 \

	__adddf3 __eqdf2 __ledf2 __ltdf2 __muldf3 __unorddf2 \

	__muloti4 __multi3 \

	__udivmodti4 __udivti3 __umodti3

rust/compiler_builtins.rs

+3 −0
Original line number Diff line number Diff line
@@ -40,16 +40,19 @@ pub extern "C" fn $ident() { 
define_panicking_intrinsics!("`f32` should not be used", {

    __addsf3,

    __eqsf2,

    __extendsfdf2,

    __gesf2,

    __lesf2,

    __ltsf2,

    __mulsf3,

    __nesf2,

    __truncdfsf2,

    __unordsf2,

});



define_panicking_intrinsics!("`f64` should not be used", {

    __adddf3,

    __eqdf2,

    __ledf2,

    __ltdf2,

    __muldf3,

scripts/generate_rust_analyzer.py

+5 −1
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ def main(): 
    parser.add_argument('--cfgs', action='append', default=[])

    parser.add_argument("srctree", type=pathlib.Path)

    parser.add_argument("objtree", type=pathlib.Path)

    parser.add_argument("sysroot", type=pathlib.Path)

    parser.add_argument("sysroot_src", type=pathlib.Path)

    parser.add_argument("exttree", type=pathlib.Path, nargs="?")

    args = parser.parse_args()
@@ -154,9 +155,12 @@ def main(): 
        level=logging.INFO if args.verbose else logging.WARNING

    )



    # Making sure that the `sysroot` and `sysroot_src` belong to the same toolchain.

    assert args.sysroot in args.sysroot_src.parents



    rust_project = {

        "crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs),

        "sysroot_src": str(args.sysroot_src),

        "sysroot": str(args.sysroot),

    }



    json.dump(rust_project, sys.stdout, sort_keys=True, indent=4)