mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
rust: Upgrade 1.76.0->1.77.0
* Drop backported patch 0001-Handle-vendored-sources-when-remapping-paths.patch
as it's merged with rust v1.77.0.
https://blog.rust-lang.org/2024/03/21/Rust-1.77.0.html
(From OE-Core rev: 8b6b224fc116150c0af658473eecd05b742de7b1)
Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yash Shinde
committed by
Richard Purdie
Richard Purdie
parent
4c9d7632f6
commit
41094aece8
@@ -24,7 +24,7 @@ GLIBCVERSION ?= "2.40%"
|
||||
LINUXLIBCVERSION ?= "6.10%"
|
||||
QEMUVERSION ?= "9.0%"
|
||||
GOVERSION ?= "1.22%"
|
||||
RUSTVERSION ?= "1.76%"
|
||||
RUSTVERSION ?= "1.77%"
|
||||
|
||||
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
|
||||
|
||||
-46
@@ -1,46 +0,0 @@
|
||||
From 5e37ea7cb9d99d91f2c5ac6edf19ff777f95bb88 Mon Sep 17 00:00:00 2001
|
||||
From: Arlo Siemsen <arsiem@microsoft.com>
|
||||
Date: Thu, 4 Jan 2024 11:40:56 -0600
|
||||
Subject: [PATCH] Handle vendored sources when remapping paths
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rust-lang/rust/pull/119582]
|
||||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
||||
---
|
||||
src/bootstrap/src/core/builder.rs | 19 ++++++++++++-------
|
||||
1 file changed, 12 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
|
||||
index cd276674dee6..48fdb2c7f7b7 100644
|
||||
--- a/src/bootstrap/src/core/builder.rs
|
||||
+++ b/src/bootstrap/src/core/builder.rs
|
||||
@@ -1789,15 +1789,20 @@ pub fn cargo(
|
||||
}
|
||||
|
||||
if self.config.rust_remap_debuginfo {
|
||||
- // FIXME: handle vendored sources
|
||||
- let registry_src = t!(home::cargo_home()).join("registry").join("src");
|
||||
let mut env_var = OsString::new();
|
||||
- for entry in t!(std::fs::read_dir(registry_src)) {
|
||||
- if !env_var.is_empty() {
|
||||
- env_var.push("\t");
|
||||
- }
|
||||
- env_var.push(t!(entry).path());
|
||||
+ if self.config.vendor {
|
||||
+ let vendor = self.build.src.join("vendor");
|
||||
+ env_var.push(vendor);
|
||||
env_var.push("=/rust/deps");
|
||||
+ } else {
|
||||
+ let registry_src = t!(home::cargo_home()).join("registry").join("src");
|
||||
+ for entry in t!(std::fs::read_dir(registry_src)) {
|
||||
+ if !env_var.is_empty() {
|
||||
+ env_var.push("\t");
|
||||
+ }
|
||||
+ env_var.push(t!(entry).path());
|
||||
+ env_var.push("=/rust/deps");
|
||||
+ }
|
||||
}
|
||||
cargo.env("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP", env_var);
|
||||
}
|
||||
--
|
||||
2.39.0
|
||||
|
||||
@@ -10,13 +10,20 @@ diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen
|
||||
index b4b2ab1e1f8a..8bb3e3f0557c 100644
|
||||
--- a/compiler/rustc_codegen_llvm/src/context.rs
|
||||
+++ b/compiler/rustc_codegen_llvm/src/context.rs
|
||||
@@ -158,46 +158,6 @@ pub unsafe fn create_module<'ll>(
|
||||
@@ -34,7 +34,6 @@
|
||||
use smallvec::SmallVec;
|
||||
|
||||
use libc::c_uint;
|
||||
-use std::borrow::Borrow;
|
||||
use std::cell::{Cell, RefCell};
|
||||
use std::ffi::CStr;
|
||||
use std::str;
|
||||
@@ -155,25 +154,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
- // Ensure the data-layout values hardcoded remain the defaults.
|
||||
- if sess.target.is_builtin {
|
||||
- // tm is disposed by its drop impl
|
||||
- {
|
||||
- let tm = crate::back::write::create_informational_target_machine(tcx.sess);
|
||||
- llvm::LLVMRustSetDataLayoutFromTargetMachine(llmod, &tm);
|
||||
-
|
||||
@@ -24,36 +31,16 @@ index b4b2ab1e1f8a..8bb3e3f0557c 100644
|
||||
- let llvm_data_layout = str::from_utf8(CStr::from_ptr(llvm_data_layout).to_bytes())
|
||||
- .expect("got a non-UTF8 data-layout from LLVM");
|
||||
-
|
||||
- // Unfortunately LLVM target specs change over time, and right now we
|
||||
- // don't have proper support to work with any more than one
|
||||
- // `data_layout` than the one that is in the rust-lang/rust repo. If
|
||||
- // this compiler is configured against a custom LLVM, we may have a
|
||||
- // differing data layout, even though we should update our own to use
|
||||
- // that one.
|
||||
- //
|
||||
- // As an interim hack, if CFG_LLVM_ROOT is not an empty string then we
|
||||
- // disable this check entirely as we may be configured with something
|
||||
- // that has a different target layout.
|
||||
- //
|
||||
- // Unsure if this will actually cause breakage when rustc is configured
|
||||
- // as such.
|
||||
- //
|
||||
- // FIXME(#34960)
|
||||
- let cfg_llvm_root = option_env!("CFG_LLVM_ROOT").unwrap_or("");
|
||||
- let custom_llvm_used = !cfg_llvm_root.trim().is_empty();
|
||||
-
|
||||
- if !custom_llvm_used && target_data_layout != llvm_data_layout {
|
||||
- bug!(
|
||||
- "data-layout for target `{rustc_target}`, `{rustc_layout}`, \
|
||||
- differs from LLVM target's `{llvm_target}` default layout, `{llvm_layout}`",
|
||||
- rustc_target = sess.opts.target_triple,
|
||||
- rustc_layout = target_data_layout,
|
||||
- llvm_target = sess.target.llvm_target,
|
||||
- llvm_layout = llvm_data_layout
|
||||
- );
|
||||
- if target_data_layout != llvm_data_layout {
|
||||
- tcx.dcx().emit_err(crate::errors::MismatchedDataLayout {
|
||||
- rustc_target: sess.opts.target_triple.to_string().as_str(),
|
||||
- rustc_layout: target_data_layout.as_str(),
|
||||
- llvm_target: sess.target.llvm_target.borrow(),
|
||||
- llvm_layout: llvm_data_layout,
|
||||
- });
|
||||
- }
|
||||
- }
|
||||
-
|
||||
let data_layout = SmallCStr::new(&target_data_layout);
|
||||
llvm::LLVMSetDataLayout(llmod, data_layout.as_ptr());
|
||||
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -4,47 +4,56 @@
|
||||
## The exact (previous) version that has been used is specified in the source tarball.
|
||||
## The version is replicated here.
|
||||
|
||||
SNAPSHOT_VERSION = "1.75.0"
|
||||
SNAPSHOT_VERSION = "1.76.0"
|
||||
|
||||
SRC_URI[cargo-snapshot-aarch64.sha256sum] = "cf367bccbc97ba86b4cf8a0141c9c270523e38f865dc7220b3cfdd79b67200ed"
|
||||
SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "2ea0dc380ac1fced245bafadafd0da50167a4a416b6011e3d73ba3e657a71d15"
|
||||
SRC_URI[rustc-snapshot-aarch64.sha256sum] = "b1d7bb8b0420b71585cf9c4eb5fd1e986fd83edc2d393510b54a9b20272386a3"
|
||||
SRC_URI[cargo-snapshot-aarch64.sha256sum] = "d0c54d824e64b7313a974409541ca3a157b3ed7299865786bd0c440b0e073091"
|
||||
SRC_URI[clippy-snapshot-aarch64.sha256sum] = "4d9d8e392b03965b01591f16b233e91d48a597e731e0cd04dc495512dd4775e2"
|
||||
SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "c0c579d9321da855109a2b6c7d7c9e01549db37e8490f058cfdc0012bef394cd"
|
||||
SRC_URI[rustc-snapshot-aarch64.sha256sum] = "a299b5053d2771c24e3d5787caa0317ea729618700acacf2eeb95e345a92529c"
|
||||
|
||||
SRC_URI[cargo-snapshot-i686.sha256sum] = "ab652e4755def10f37c245245643d60f56cb28a7dcd2defb8a1d560eafbf08f1"
|
||||
SRC_URI[rust-std-snapshot-i686.sha256sum] = "42c0aba08ddcad191c84adcb5b6479b4599b9e4656e4e2b6d3ed5b46fa4a04fb"
|
||||
SRC_URI[rustc-snapshot-i686.sha256sum] = "a39aed533c63b4da6c0d9f30e76d7290ed5b3be2e66bde43d02764d7b50d382f"
|
||||
SRC_URI[cargo-snapshot-i686.sha256sum] = "ffa9b2b65a3bd6298ffd5a2defd6ac5fa42d1a0dcefdea50b92ddf8d162db19c"
|
||||
SRC_URI[clippy-snapshot-i686.sha256sum] = "a6eb9271424ac326ef7609b1c2113916e42801ca271348708ff032490b66ac50"
|
||||
SRC_URI[rust-std-snapshot-i686.sha256sum] = "78fb0859beb4f18af7227af3f09f0218169ca38c7751865e40d78d697ca190fc"
|
||||
SRC_URI[rustc-snapshot-i686.sha256sum] = "e52ff92c605284b049e88912343a0f1c9c4cef7cc4a501d4e8f1ab9e4d9b1d7e"
|
||||
|
||||
SRC_URI[cargo-snapshot-loongarch64.sha256sum] = "e4e4b38375a2fa0697b80ef6d7b0f8a4505836baded47b755ad751fbe605354b"
|
||||
SRC_URI[rust-std-snapshot-loongarch64.sha256sum] = "fede876247ca3977a001cfca9038851eb99dd38063fc2bec439e75e25453242d"
|
||||
SRC_URI[rustc-snapshot-loongarch64.sha256sum] = "36a6507eb6c5fc6d3884579e908ab7865436a1705e42677bcb5d1d75e5bee8d7"
|
||||
SRC_URI[cargo-snapshot-loongarch64.sha256sum] = "ff5ece4942139dac43bae14293602cce5bb87c700fa051eb5a6cd7b08eebeafc"
|
||||
SRC_URI[clippy-snapshot-loongarch64.sha256sum] = "ed8abd72fbbd9320573752eee465559743b94832007b3beda9b7ecbee596bf61"
|
||||
SRC_URI[rust-std-snapshot-loongarch64.sha256sum] = "0b96bc12af2d2477e7e6b22befbf37b759e56035414d8aa85975e3050c88dae5"
|
||||
SRC_URI[rustc-snapshot-loongarch64.sha256sum] = "59c8ec9441a73223873bf561f0c36719b130788a03e8e04955e3b79625a8d68c"
|
||||
|
||||
SRC_URI[cargo-snapshot-powerpc.sha256sum] = "c758265f0fe5a5c36fccd9f67a297c3274a795e67530aa8c09d376840d6184af"
|
||||
SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "eb56d591650773c7ce00f32fde1adcb878b4010167f348ea167d492fba8628d0"
|
||||
SRC_URI[rustc-snapshot-powerpc.sha256sum] = "49a6adcc8d26a38a77048b13b46f83581ee33262627099ea4f6d0d8eacaf889c"
|
||||
SRC_URI[cargo-snapshot-powerpc.sha256sum] = "b5c2e394fb300b480d9e15d519dba6dd40a20fda91117dc3ede721af1bac8645"
|
||||
SRC_URI[clippy-snapshot-powerpc.sha256sum] = "1227f8989ae609afe0d771060262e113ead080ac863bd5c7f89a6b491d5b7025"
|
||||
SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "773189b5fc9c2252801dd10da23dfd54577f25fcaf8f4077b4d5bc2169079653"
|
||||
SRC_URI[rustc-snapshot-powerpc.sha256sum] = "00b27ff304d5af9663778a6f6dd70a85a98fe8db877054bb4080206372faf571"
|
||||
|
||||
SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "409c9f596e9f88da78587edff1633c319ac0ac14ea622f26d30d16ec1f92e1c9"
|
||||
SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "776ea8d200f65cacdb619eecae319511ec2ab398321c8d976c846b9dc44b87d5"
|
||||
SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "6888a22227037aa3015a2195905acdea420e51f0909cf6653b30765938ea5745"
|
||||
SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "dcf7e9e0b247f56759528db601eec76ff9c471457acd84c4c47e42b35ad2edd2"
|
||||
SRC_URI[clippy-snapshot-powerpc64.sha256sum] = "903e30eeefd11d923412e2ddfb695126d80d5101afd1838e61d7cdca4acdad04"
|
||||
SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "312699dea45a90f4f80bba87e12c410378b39c819bd089b1219101f101b49833"
|
||||
SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "ab397f7ea75b18b5c5e01b878772f1c91f102a09b46c60dae5110318cb17c677"
|
||||
|
||||
SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "6b293abc4cafba101c714b37dc369cd229e04151efad626896b811165019bb95"
|
||||
SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "22286818e4f0f13f712082e7a740aceb32e28ab3f568d6ed0e9e06b4972b30f5"
|
||||
SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "5268dd59f78f946d2dba8ad362ba8c724432422c6f497a69f6dbad240e4497d0"
|
||||
SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "c3b249f7db0fe6db2e6a52ab183cdec544ccf7fa22c27cddb039e389da85b8f7"
|
||||
SRC_URI[clippy-snapshot-powerpc64le.sha256sum] = "49ed5e82d833b91a943163183f5c4cfccae92dca9b2758a846dc9f084e0a5651"
|
||||
SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "939fe0ffe27b4cbec4e8f43a69e795460f507b3b57753e2644546d9d57fe7a39"
|
||||
SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "51ad28e1e646c6659110ecc8189fc519916e9317c50a05d20e4555e919751edb"
|
||||
|
||||
SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "13937d19fc5fa531c1def3a526695be94aeb34e7f8653fc6e5acd782bcc6267d"
|
||||
SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "35db7870fbe27308c2a9bad0371cd05af2fd2975e00b7f5a5bb305798960a9cb"
|
||||
SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "4dbed202d8d11eb1fb29204bf9d8358e8da85791e990ec1dd576f75701b33abb"
|
||||
SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "2799a565834247d67b7e84dda209a662aaa6fd16bbb7d46d78882de3a56b7df0"
|
||||
SRC_URI[clippy-snapshot-riscv64gc.sha256sum] = "ea678064035f634c877bd3cc2559beb82bee10b5e2cddc2e3e37baea0ce4b472"
|
||||
SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "ecbf009619d6704f0a8384252b41d11851dadbf0d9809ec80d77765d029883a4"
|
||||
SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "f0661f1ae574947c6762b8ffd756de7e9199ff4790f1fcb9c994a3b49684a9a0"
|
||||
|
||||
SRC_URI[cargo-snapshot-s390x.sha256sum] = "720cabf7e03d91bf080cb15d5ebb8fb56eae1938b7ab763f82aa46a997d1ddb7"
|
||||
SRC_URI[rust-std-snapshot-s390x.sha256sum] = "810be45b498c4ce1ba9181702a2534c5a35e52fbab547d94b62f70e28388748d"
|
||||
SRC_URI[rustc-snapshot-s390x.sha256sum] = "ce4faea55ee9a5032ad6eca5f1b0be3d572d6fc0146366c0c984831322b6e3a3"
|
||||
SRC_URI[cargo-snapshot-s390x.sha256sum] = "3697dab26ed0bc98f8d536d81f7176e5162dfc3629507d942b7c7d4e7b1db928"
|
||||
SRC_URI[clippy-snapshot-s390x.sha256sum] = "657521dcc91256cd023fe2c3c29d12d402f0a905dbd3713eddd5670c3fe36bb6"
|
||||
SRC_URI[rust-std-snapshot-s390x.sha256sum] = "e5eedfb57fe7f93c77ea91df391607ffe553349169c1b60b5d8ad040a7fd639b"
|
||||
SRC_URI[rustc-snapshot-s390x.sha256sum] = "c59a8246e5bd960b5875d8ab4e66be9d9adf376b61e99dee32a3e3e66f8197e6"
|
||||
|
||||
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "6ac164e7da969a1d524f747f22792e9aa08bc7446f058314445a4f3c1d31a6bd"
|
||||
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "136b132199f7bbda2aa0bbff6d1e6ae7d5fca2994a2f2a432a5e99de224b6314"
|
||||
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "2824ba4045acdddfa436da4f0bb72807b64a089aa2e7c9a66ca1a3a571114ce7"
|
||||
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "30ec0ad9fca443ec12c544f9ce448dacdde411a45b9042961938b650e918ccfb"
|
||||
SRC_URI[clippy-snapshot-x86_64.sha256sum] = "0ba679a46d2b1f4e336acfbd892f50c800ba090ddc8de37fde679f9a6241ba7b"
|
||||
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "e41150b52d923a3bbe166c4ecc5719f56576274b0d034d764768aee279ae2063"
|
||||
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "9fadfcf71bc6a0ddfd026b9624163faf1c5689dd4a1f7cc1f857167ade4aa6eb"
|
||||
|
||||
SRC_URI[rust-std-snapshot-i586.sha256sum] = "7bdc6cd915a47e116ca78e07fe8d5d8acb6217e2aa6187806f782d81853a39b3"
|
||||
SRC_URI[rust-std-snapshot-i586.sha256sum] = "d456e1b697ce63e327df44945478a276938bbd293bc564ff4ff075603e7f521d"
|
||||
|
||||
SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "6943fda4f3958f28883cc5fb9f455611cc42f4d228841984b8a2a0123e7b65a7"
|
||||
SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "9a192c3a41d15f812346f5a36c4503937cbeffc8f05856a6747f6c880dbd8729"
|
||||
|
||||
SRC_URI += " \
|
||||
${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
|
||||
|
||||
@@ -6,7 +6,6 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
|
||||
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC} \
|
||||
file://rv32-rustix-libc-backend.patch;patchdir=${RUSTSRC} \
|
||||
file://rv32-cargo-rustix-0.38.19-fix.patch;patchdir=${RUSTSRC} \
|
||||
file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC} \
|
||||
file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \
|
||||
file://0001-cargo-do-not-write-host-information-into-compilation.patch;patchdir=${RUSTSRC} \
|
||||
file://rustdoc-repro-issue-fix-cargo-config-for-codegenunits.patch;patchdir=${RUSTSRC} \
|
||||
@@ -15,7 +14,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
|
||||
file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \
|
||||
file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \
|
||||
"
|
||||
SRC_URI[rust.sha256sum] = "805482b436442a6786d270cacbab8f00529e06141b27b7fb01909b97ce4f3464"
|
||||
SRC_URI[rust.sha256sum] = "66126989782cbf77fa3aff121bbb108429f2d46fe19328c3de231553de711b90"
|
||||
|
||||
RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user