From 8fd396bc3dc18101bc0e9cc34b7ed25d24b6cfea Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Fri, 29 Dec 2023 11:44:34 +0000 Subject: rust: Upgrade 1.73.0 -> 1.74.0 Replace musl fixes with backports from upstream. Add sysconfdir to config.toml to fix: | thread 'main' panicked at install.rs:92:9: | User doesn't have write access on `install.sysconfdir` path in `config.toml`. https://blog.rust-lang.org/2023/11/16/Rust-1.74.0.html (From OE-Core rev: 84f46dd2503bb0ef238fef0097c66fda88f6cbda) Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/files/hardcodepaths.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'meta/recipes-devtools/rust/files/hardcodepaths.patch') diff --git a/meta/recipes-devtools/rust/files/hardcodepaths.patch b/meta/recipes-devtools/rust/files/hardcodepaths.patch index 6eb091461f..a043095f62 100644 --- a/meta/recipes-devtools/rust/files/hardcodepaths.patch +++ b/meta/recipes-devtools/rust/files/hardcodepaths.patch @@ -1,4 +1,4 @@ -When building for the target, some build paths end up embedded in the binaries. +When building for the target, some build paths end up embedded in the binaries. These changes remove that. Further investigation is needed to work out the way to resolve these issues properly upstream. @@ -6,19 +6,19 @@ Upstream-Status: Inappropriate [patches need rework] Signed-off-by: Richard Purdie Signed-off-by: Alex Kiernan -Index: rustc-1.73.0-src/compiler/rustc_codegen_llvm/src/context.rs -=================================================================== ---- rustc-1.73.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs -+++ rustc-1.73.0-src/compiler/rustc_codegen_llvm/src/context.rs -@@ -157,46 +157,6 @@ pub unsafe fn create_module<'ll>( +diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs +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>( } } - // 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); -- llvm::LLVMRustDisposeTargetMachine(tm); +- llvm::LLVMRustSetDataLayoutFromTargetMachine(llmod, &tm); - - let llvm_data_layout = llvm::LLVMGetDataLayoutStr(llmod); - let llvm_data_layout = str::from_utf8(CStr::from_ptr(llvm_data_layout).to_bytes()) -- cgit v1.2.3-54-g00ecf