rust: Upgrade 1.98.1 -> 1.99.0
PATCH 1/1 rust: Upgrade 1.98.1 -> 1.99.0
From: Hemanth Kumar M D <[email protected]>
Rust Changes:
https://github.com/rust-lang/rust/releases/tag/1.99.0
Cargo Changes:
https://doc.rust-lang.org/nightly/cargo/CHANGELOG.html
Update local patches:
0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch 0007-cargo-omit-host-triple-from-unit-metadata-hash.patch rust-oe-selftest.patch
Drop merged patches:
0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch 0004-Backport-commits-from-rust-Fix-selftest-llvm23.patch 0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch
rust_1.99.0.bb: drop "rust.use-lld" and "rust.lld" options.
"rust.use-lld" was renamed to "rust.bootstrap-override-lld" and its alias removed this release, so bootstrap now rejects it and do_install fails. The new option keeps the previous default, so dropping these lines is sufficient. See [1] and [2].
[1] https://github.com/rust-lang/rust/pull/147046
[2] https://github.com/rust-lang/rust/pull/160142
rust v1.99.0 (from autobuilder)
+-------------+---------+---------+ | Machine | Passed | Skipped | +-------------+---------+---------+ | qemux86-64 | 23690 | 1022 | | qemux86 | 23427 | 1285 | | qemuarm | 23407 | 1305 | | qemuarm64 | 23521 | 1191 | | qemuriscv64 | 23463 | 1249 | +-------------+---------+---------+
Test results difference (1.99.0 - 1.98.1):
+-------------+--------+---------+ | Machine | Passed | Skipped | +-------------+--------+---------+ | qemux86-64 | +520 | +214 | | qemux86 | +512 | +222 | | qemuarm | +512 | +222 | | qemuarm64 | +520 | +214 | | qemuriscv64 | +519 | +215 | +-------------+--------+---------+
---
meta/conf/distro/include/maintainers.inc | 2 +-
meta/conf/distro/include/tcmode-default.inc | 2 +-
.../rust/{cargo_1.98.1.bb => cargo_1.99.0.bb} | 0
...l-codes-on-riscv32gc-unknown-linux-g.patch | 219 ------
...teps-tool.rs-switch-off-lto-for-rust.patch | 51 +-
...ommits-from-rust-Fix-selftest-llvm23.patch | 661 ------------------
...-host-triple-from-unit-metadata-hash.patch | 6 +-
...oc-link-metadata-order-deterministic.patch | 40 --
.../rust/files/rust-oe-selftest.patch | 14 +-
...ibstd-rs_1.98.1.bb => libstd-rs_1.99.0.bb} | 0
....98.1.bb => rust-cross-canadian_1.99.0.bb} | 0
meta/recipes-devtools/rust/rust-snapshot.inc | 104 +--
meta/recipes-devtools/rust/rust-source.inc | 5 +-
...source_1.98.1.bb => rust-source_1.99.0.bb} | 0
.../rust/{rust_1.98.1.bb => rust_1.99.0.bb} | 2 -
15 files changed, 89 insertions(+), 1017 deletions(-)
rename meta/recipes-devtools/rust/{cargo_1.98.1.bb => cargo_1.99.0.bb} (100%)
delete mode 100644 meta/recipes-devtools/rust/files/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
delete mode 100644 meta/recipes-devtools/rust/files/0004-Backport-commits-from-rust-Fix-selftest-llvm23.patch
delete mode 100644 meta/recipes-devtools/rust/files/0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch
rename meta/recipes-devtools/rust/{libstd-rs_1.98.1.bb => libstd-rs_1.99.0.bb} (100%)
rename meta/recipes-devtools/rust/{rust-cross-canadian_1.98.1.bb => rust-cross-canadian_1.99.0.bb} (100%)
rename meta/recipes-devtools/rust/{rust-source_1.98.1.bb => rust-source_1.99.0.bb} (100%)
rename meta/recipes-devtools/rust/{rust_1.98.1.bb => rust_1.99.0.bb} (99%)meta/conf/distro/include/maintainers.inc +1 -1
@@ -785,7 +785,7 @@ RECIPE_MAINTAINER:pn-ruby = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-rust = "Randy MacLeod <[email protected]>" RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod <[email protected]>" -RECIPE_MAINTAINER:pn-rust-source-1.98.1 = "Deepesh Varatharajan <[email protected]>" +RECIPE_MAINTAINER:pn-rust-source-1.99.0 = "Deepesh Varatharajan <[email protected]>" RECIPE_MAINTAINER:pn-rxvt-unicode = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-sassc = "Simone Weiß <[email protected]>" RECIPE_MAINTAINER:pn-sato-icon-theme = "Richard Purdie <[email protected]>"
meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "16.%" SDKGCCVERSION ?= "${GCCVERSION}" GLIBCVERSION ?= "2.44%" -RUSTVERSION ?= "1.98.1%" +RUSTVERSION ?= "1.99.0%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
meta/recipes-devtools/rust/cargo_1.99.0.bb renamed from meta/recipes-devtools/rust/cargo_1.98.1.bb +0 -0
meta/recipes-devtools/rust/files/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch deleted +0 -219
219 lines not on this page · raw message
meta/recipes-devtools/rust/files/0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch +23 -28
79 lines not on this page · raw message
meta/recipes-devtools/rust/files/0004-Backport-commits-from-rust-Fix-selftest-llvm23.patch deleted +0 -661
661 lines not on this page · raw message
meta/recipes-devtools/rust/files/0007-cargo-omit-host-triple-from-unit-metadata-hash.patch +3 -3
@@ -23,10 +23,10 @@ Signed-off-by: Sunil Dora <[email protected]> .../core/compiler/build_runner/compilation_files.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) -diff --git a/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs b/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs +diff --git a/src/tools/cargo/src/compiler/build_runner/compilation_files.rs b/src/tools/cargo/src/compiler/build_runner/compilation_files.rs index 88cab85..9dbd203 100644 ---- a/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs -+++ b/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs +--- a/src/tools/cargo/src/compiler/build_runner/compilation_files.rs ++++ b/src/tools/cargo/src/compiler/build_runner/compilation_files.rs @@ -877,7 +877,7 @@ fn has_remap_path_prefix(args: &[String]) -> bool { }
meta/recipes-devtools/rust/files/0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 6630363e7bc9bc0926300e242aa538b8d92cdb95 Mon Sep 17 00:00:00 2001 -From: jprochazk <[email protected]> -Date: Tue, 15 Sep 2026 17:05:36 +0530 -Subject: [PATCH] make DocLinkResMap an FxIndexMap - -DocLinkResMap was an UnordMap, so its iteration order varied with the build -host and that order ended up in the encoded rmeta. An FxIndexMap keeps the -serialisation stable. Only the code change is carried here, not the -upstream run-make test. - -Upstream-Status: Backport [https://github.com/rust-lang/rust/commit/f9d9939467a5185a72f0ee8da778a0b71fc966ae] - -Signed-off-by: Sunil Dora <[email protected]> ---- - compiler/rustc_hir/src/def.rs | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/compiler/rustc_hir/src/def.rs b/compiler/rustc_hir/src/def.rs -index d0300d6..e903c0c 100644 ---- a/compiler/rustc_hir/src/def.rs -+++ b/compiler/rustc_hir/src/def.rs -@@ -4,7 +4,7 @@ use std::fmt::Debug; - - use rustc_ast as ast; - use rustc_ast::NodeId; --use rustc_data_structures::unord::UnordMap; -+use rustc_data_structures::fx::FxIndexMap; - use rustc_error_messages::{DiagArgValue, IntoDiagArg}; - use rustc_macros::{Decodable, Encodable, StableHash}; - use rustc_span::Symbol; -@@ -969,4 +969,6 @@ pub enum LifetimeRes { - ElidedAnchor { start: NodeId, end: NodeId }, - } - --pub type DocLinkResMap = UnordMap<(Symbol, Namespace), Option<Res<NodeId>>>; -+// FxIndexMap is necessary because its data ends up in .rmeta files, so its -+// iteration order must be consistent. See #159677 for context. -+pub type DocLinkResMap = FxIndexMap<(Symbol, Namespace), Option<Res<NodeId>>>; --- -2.43.0
meta/recipes-devtools/rust/files/rust-oe-selftest.patch +8 -6
@@ -280,10 +280,13 @@ index 89c61cd..144ea0e 100644 use std::process::ExitCode; // A note about jemalloc: rustc uses jemalloc when built for CI and -@@ -41,6 +41,7 @@ - #[cfg(feature = "jemalloc")] - use tikv_jemalloc_sys as _; - +@@ -34,8 +34,10 @@ + // to compare their performance, see + // https://github.com/rust-lang/rust/commit/b90cfc887c31c3e7a9e6d462e2464db1fe506175#diff-43914724af6e464c1da2171e4a9b6c7e607d5bc1203fa95c0ab85be4122605ef + // for an example of how to do so. ++#[cfg(not(test))] + rustc_driver::override_c_allocator_in_binary!(); + +#[cfg(not(test))] fn main() -> ExitCode { rustc_driver::main()
@@ -292,13 +295,12 @@ diff --git a/tests/ui/c-variadic/same-program-multiple-abis-arm.rs b/tests/ui/c- index fbc5573..f259529 100644 --- a/tests/ui/c-variadic/same-program-multiple-abis-arm.rs +++ b/tests/ui/c-variadic/same-program-multiple-abis-arm.rs -@@ -1,5 +1,6 @@ +@@ -1,4 +1,5 @@ //@ run-pass //@ only-arm +//@ ignore-arm //@ ignore-thumb (this test uses arm assembly) //@ only-eabihf (the assembly below requires float hardware support) - #![feature(c_variadic, c_variadic_naked_functions)] diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs index ab69cf5..f0e3fd3 100644 --- a/compiler/rustc_interface/src/tests.rs
meta/recipes-devtools/rust/libstd-rs_1.99.0.bb renamed from meta/recipes-devtools/rust/libstd-rs_1.98.1.bb +0 -0
meta/recipes-devtools/rust/rust-cross-canadian_1.99.0.bb renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.98.1.bb +0 -0
meta/recipes-devtools/rust/rust-snapshot.inc +52 -52
110 lines not on this page · raw message
meta/recipes-devtools/rust/rust-source.inc +1 -4
@@ -1,19 +1,16 @@ RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}" SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \ - file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${RUSTSRC} \ file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \ file://cc-hash-object-names-relative-to-source-roots.patch;patchdir=${RUSTSRC} \ 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://0004-Backport-commits-from-rust-Fix-selftest-llvm23.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://0008-rustc-hir-make-doc-link-metadata-order-deterministic.patch;patchdir=${RUSTSRC} \ file://0009-rustc-span-make-hygiene-encoding-order-deterministic.patch;patchdir=${RUSTSRC} \ " -SRC_URI[rust.sha256sum] = "be1816e7f6c40abb90245ad6e024bed2a7e88d7dda4561e4d5470207df616b9f" +SRC_URI[rust.sha256sum] = "cc41916a8c84f5d9ec4f55561b44e39f43b647b133f8a6f51be9ea13c83f7036" # Point UNPACKDIR into the work-shared location so rust-source.bb and all # consumers (via S/RUSTSRC) reference a single shared source tree.
meta/recipes-devtools/rust/rust-source_1.99.0.bb renamed from meta/recipes-devtools/rust/rust-source_1.98.1.bb +0 -0
meta/recipes-devtools/rust/rust_1.99.0.bb renamed from meta/recipes-devtools/rust/rust_1.98.1.bb +0 -2
@@ -151,8 +151,6 @@ python do_configure() { config.set("rust", "remap-debuginfo", e(True)) config.set("rust", "download-rustc", e(False)) config.set("rust", "llvm-tools", e(False)) - config.set("rust", "lld", e(False)) - config.set("rust", "use-lld", e(False)) config.set("rust", "channel", e(d.expand("${RUST_CHANNEL}"))) # Whether or not to optimize the compiler and standard library
Signature · 1 line
2.49.0
Quoted 50 lines · Hemanth Kumar M D via lists.openembedded.org
From: Hemanth Kumar M D <[email protected]>
Rust Changes:
https://github.com/rust-lang/rust/releases/tag/1.99.0Cargo Changes:
https://doc.rust-lang.org/nightly/cargo/CHANGELOG.htmlUpdate local patches:
0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch 0007-cargo-omit-host-triple-from-unit-metadata-hash.patch rust-oe-selftest.patchDrop merged patches:
0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch 0004-Backport-commits-from-rust-Fix-selftest-llvm23.patch 0008-rustc-hir-make-doc-link-metadata-order-deterministic.patchrust_1.99.0.bb: drop "rust.use-lld" and "rust.lld" options. "rust.use-lld" was renamed to "rust.bootstrap-override-lld" and its alias removed this release, so bootstrap now rejects it and
do_installfails. The new option keeps the previous default, so dropping these lines is sufficient. See [1] and [2].[1] https://github.com/rust-lang/rust/pull/147046
[2] https://github.com/rust-lang/rust/pull/160142rust v1.99.0 (from autobuilder)
+-------------+---------+---------+ > Machine | Passed | Skipped | +-------------+---------+---------+ > qemux86-64 | 23690 | 1022 | > qemux86 | 23427 | 1285 | > qemuarm | 23407 | 1305 | > qemuarm64 | 23521 | 1191 | > qemuriscv64 | 23463 | 1249 | +-------------+---------+---------+Test results difference (1.99.0 - 1.98.1):
+-------------+--------+---------+ > Machine | Passed | Skipped | +-------------+--------+---------+ > qemux86-64 | +520 | +214 | > qemux86 | +512 | +222 | > qemuarm | +512 | +222 | > qemuarm64 | +520 | +214 | > qemuriscv64 | +519 | +215 | +-------------+--------+---------+
Quoted 1 line
Signed-off-by Hemanth Kumar M D <[email protected]>
The autobuilder showed one issue so far:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/80/builds/4613
Cheers,
Richard
Quoted 52 lines · Richard Purdie
CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.Quoted 48 lines · Hemanth Kumar M D via lists.openembedded.org
From: Hemanth Kumar M D <[email protected]>
Rust Changes:
https://github.com/rust-lang/rust/releases/tag/1.99.0Cargo Changes:
https://doc.rust-lang.org/nightly/cargo/CHANGELOG.htmlUpdate local patches:
0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch 0007-cargo-omit-host-triple-from-unit-metadata-hash.patch rust-oe-selftest.patchDrop merged patches:
0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch 0004-Backport-commits-from-rust-Fix-selftest-llvm23.patch 0008-rustc-hir-make-doc-link-metadata-order-deterministic.patchrust_1.99.0.bb: drop "rust.use-lld" and "rust.lld" options.
"rust.use-lld" was renamed to "rust.bootstrap-override-lld" and its alias removed this release, so bootstrap now rejects it anddo_installfails. The new option keeps the previous default, so dropping these lines is sufficient. See [1] and [2].[1] https://github.com/rust-lang/rust/pull/147046
[2] https://github.com/rust-lang/rust/pull/160142rust v1.99.0 (from autobuilder)
+-------------+---------+---------+ > Machine | Passed | Skipped | +-------------+---------+---------+ > qemux86-64 | 23690 | 1022 | > qemux86 | 23427 | 1285 | > qemuarm | 23407 | 1305 | > qemuarm64 | 23521 | 1191 | > qemuriscv64 | 23463 | 1249 | +-------------+---------+---------+Test results difference (1.99.0 - 1.98.1):
+-------------+--------+---------+ > Machine | Passed | Skipped | +-------------+--------+---------+ > qemux86-64 | +520 | +214 | > qemux86 | +512 | +222 | > qemuarm | +512 | +222 | > qemuarm64 | +520 | +214 | > qemuriscv64 | +519 | +215 |
Quoted 6 lines
Quoted 3 lines
+-------------+--------+---------+
Signed-off-by Hemanth Kumar M D <[email protected]>The autobuilder showed one issue so far:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/80/builds/4613
Hi Richard ,
Thanks for the review and testing.
I have sent a fix for this failure: https://lists.openembedded.org/g/openembedded-core/topic/patch_rust_target_config/121608206
Quoted 3 lines
Cheers,
Richard
Signature · 2 lines
Regards, Hemanth Kumar M D