mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

rust: Upgrade 1.68.2 -> 1.69.0

Browse Source 
Rebase patches, drop crossbeam_atomic is this fully merged upstream.

https://blog.rust-lang.org/2023/04/20/Rust-1.69.0.html

(From OE-Core rev: 39e05f9b0fdc3f76f8b80a12989f78614bc9ea5c)

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alex Kiernan
2023-04-26 16:40:53 +01:00
committed by Richard Purdie
parent 2e84bb1971
commit b17491f7f1
12 changed files with 99 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/rust/files/hardcodepaths.patch
+5 -6
View File
@@ -4,12 +4,11 @@ to resolve these issues properly upstream.
Upstream-Status: Inappropriate [patches need rework]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs
===================================================================
--- rustc-1.66.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs
+++ rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs
@@ -160,46 +160,6 @@ pub unsafe fn create_module<'ll>(
--- rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs.orig 2023-04-21 08:38:23.092458478 +0100
+++ rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs 2023-04-21 08:39:00.266819755 +0100
@@ -156,46 +156,6 @@
}
}
@@ -39,7 +38,7 @@ Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs
- //
- // FIXME(#34960)
- let cfg_llvm_root = option_env!("CFG_LLVM_ROOT").unwrap_or("");
- let custom_llvm_used = cfg_llvm_root.trim() != "";
- let custom_llvm_used = !cfg_llvm_root.trim().is_empty();
-
- if !custom_llvm_used && target_data_layout != llvm_data_layout {
- bug!(