diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4446732e9f..5fe4c2b97f 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -784,7 +784,7 @@ RECIPE_MAINTAINER:pn-ruby = "Ross Burton " RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton " RECIPE_MAINTAINER:pn-rust = "Randy MacLeod " RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod " -RECIPE_MAINTAINER:pn-rust-source-1.99.0 = "Deepesh Varatharajan " +RECIPE_MAINTAINER:pn-rust-source-1.99.1 = "Deepesh Varatharajan " RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned " RECIPE_MAINTAINER:pn-sassc = "Simone Weiß " RECIPE_MAINTAINER:pn-sato-icon-theme = "Richard Purdie " diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index a52d5f19d8..6632f8ff97 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "16.%" SDKGCCVERSION ?= "${GCCVERSION}" GLIBCVERSION ?= "2.44%" -RUSTVERSION ?= "1.99.0%" +RUSTVERSION ?= "1.99.1%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" diff --git a/meta/recipes-devtools/rust/cargo_1.99.0.bb b/meta/recipes-devtools/rust/cargo_1.99.1.bb similarity index 100% rename from meta/recipes-devtools/rust/cargo_1.99.0.bb rename to meta/recipes-devtools/rust/cargo_1.99.1.bb diff --git a/meta/recipes-devtools/rust/files/0007-cargo-omit-host-triple-from-unit-metadata-hash.patch b/meta/recipes-devtools/rust/files/0004-cargo-omit-host-triple-from-unit-metadata-hash.patch similarity index 100% rename from meta/recipes-devtools/rust/files/0007-cargo-omit-host-triple-from-unit-metadata-hash.patch rename to meta/recipes-devtools/rust/files/0004-cargo-omit-host-triple-from-unit-metadata-hash.patch diff --git a/meta/recipes-devtools/rust/files/0009-rustc-span-make-hygiene-encoding-order-deterministic.patch b/meta/recipes-devtools/rust/files/0005-rustc-span-make-hygiene-encoding-order-deterministic.patch similarity index 100% rename from meta/recipes-devtools/rust/files/0009-rustc-span-make-hygiene-encoding-order-deterministic.patch rename to meta/recipes-devtools/rust/files/0005-rustc-span-make-hygiene-encoding-order-deterministic.patch diff --git a/meta/recipes-devtools/rust/files/0005-rustc_codegen_llvm-Do-not-pass-amx-tf32-to-LLVM-23.patch b/meta/recipes-devtools/rust/files/0005-rustc_codegen_llvm-Do-not-pass-amx-tf32-to-LLVM-23.patch deleted file mode 100644 index 99fcd334c7..0000000000 --- a/meta/recipes-devtools/rust/files/0005-rustc_codegen_llvm-Do-not-pass-amx-tf32-to-LLVM-23.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Sunil Dora -Date: Wed, 26 Aug 2026 16:30:00 +0530 -Subject: [PATCH] rustc_codegen_llvm: do not pass amx-tf32 to LLVM 23 - -LLVM 23 removed the x86 amx-tf32 subtarget feature -(https://github.com/llvm/llvm-project/pull/207673). rust 1.98 still -lists it in the x86 table in rustc_target, so a rustc built against -LLVM 23 aborts at startup with - - '+amx-tf32' is not a recognized feature for this target - -Skip the feature in to_llvm_features when the LLVM in use is 23 or -newer, in the same style the surrounding code already uses for -avx10.1/avx10.2 on older LLVM majors. amx-tf32 is the only x86 -feature LLVM 23 removed; the rest of the table still matches X86.td. - -rust dropped the feature outright after 1.98 -(https://github.com/rust-lang/rust/pull/159310), which requires -LLVM 23 or newer unconditionally. This recipe builds against whatever -LLVM major the layer provides, so the version guard is kept instead. - -Upstream-Status: Inappropriate [rust dropped the feature after 1.98 via https://github.com/rust-lang/rust/pull/159310; this guard only exists to build 1.98 against more than one LLVM major] -Signed-off-by: Sunil Dora ---- - compiler/rustc_codegen_llvm/src/llvm_util.rs | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/compiler/rustc_codegen_llvm/src/llvm_util.rs -+++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs -@@ -286,6 +286,8 @@ - s, - smallvec![TargetFeatureFoldStrength::EnableOnly("evex512")], - )), -+ // AMX-TF32 was removed from LLVM 23 -+ "amx-tf32" if major >= 23 => None, - "avx10.1" if major < 22 => Some(LLVMFeature::new("avx10.1-512")), - "avx10.2" if major < 22 => Some(LLVMFeature::new("avx10.2-512")), - "apxf" => Some(LLVMFeature::with_dependencies( diff --git a/meta/recipes-devtools/rust/libstd-rs_1.99.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.99.1.bb similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs_1.99.0.bb rename to meta/recipes-devtools/rust/libstd-rs_1.99.1.bb diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.99.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.99.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-cross-canadian_1.99.0.bb rename to meta/recipes-devtools/rust/rust-cross-canadian_1.99.1.bb diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index d9c00e94a2..b384a0c76e 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -6,11 +6,10 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch;patchdir=${RUSTSRC} \ file://0002-Fix-rust-build-failure-with-unstable-options.patch;patchdir=${RUSTSRC} \ file://0003-bootstrap-skip-StdarchVerify-when-remote-testing.patch;patchdir=${RUSTSRC} \ - file://0005-rustc_codegen_llvm-Do-not-pass-amx-tf32-to-LLVM-23.patch;patchdir=${RUSTSRC} \ - file://0007-cargo-omit-host-triple-from-unit-metadata-hash.patch;patchdir=${RUSTSRC} \ - file://0009-rustc-span-make-hygiene-encoding-order-deterministic.patch;patchdir=${RUSTSRC} \ + file://0004-cargo-omit-host-triple-from-unit-metadata-hash.patch;patchdir=${RUSTSRC} \ + file://0005-rustc-span-make-hygiene-encoding-order-deterministic.patch;patchdir=${RUSTSRC} \ " -SRC_URI[rust.sha256sum] = "cc41916a8c84f5d9ec4f55561b44e39f43b647b133f8a6f51be9ea13c83f7036" +SRC_URI[rust.sha256sum] = "6451598a99e77f07571960f6b21d577399d3a30f33e80cbd2e3a4aae6535d265" # Point UNPACKDIR into the work-shared location so rust-source.bb and all # consumers (via S/RUSTSRC) reference a single shared source tree. diff --git a/meta/recipes-devtools/rust/rust-source_1.99.0.bb b/meta/recipes-devtools/rust/rust-source_1.99.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-source_1.99.0.bb rename to meta/recipes-devtools/rust/rust-source_1.99.1.bb diff --git a/meta/recipes-devtools/rust/rust_1.99.0.bb b/meta/recipes-devtools/rust/rust_1.99.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust_1.99.0.bb rename to meta/recipes-devtools/rust/rust_1.99.1.bb