mirror of
https://git.yoctoproject.org/poky
synced 2026-02-06 16:56:37 +01:00
41094aece8
* 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>
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
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.
|
|
|
|
Upstream-Status: Inappropriate [patches need rework]
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
|
|
|
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
|
|
@@ -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.
|
|
- {
|
|
- let tm = crate::back::write::create_informational_target_machine(tcx.sess);
|
|
- 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())
|
|
- .expect("got a non-UTF8 data-layout from LLVM");
|
|
-
|
|
- 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());
|
|
|