diff options
Diffstat (limited to 'meta/recipes-devtools/rust/files/hardcodepaths.patch')
-rw-r--r-- | meta/recipes-devtools/rust/files/hardcodepaths.patch | 16 |
1 files changed, 8 insertions, 8 deletions
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 @@ | |||
1 | When building for the target, some build paths end up embedded in the binaries. | 1 | When building for the target, some build paths end up embedded in the binaries. |
2 | These changes remove that. Further investigation is needed to work out the way | 2 | These changes remove that. Further investigation is needed to work out the way |
3 | to resolve these issues properly upstream. | 3 | to resolve these issues properly upstream. |
4 | 4 | ||
@@ -6,19 +6,19 @@ Upstream-Status: Inappropriate [patches need rework] | |||
6 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 6 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | 7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
8 | 8 | ||
9 | Index: rustc-1.73.0-src/compiler/rustc_codegen_llvm/src/context.rs | 9 | diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs |
10 | =================================================================== | 10 | index b4b2ab1e1f8a..8bb3e3f0557c 100644 |
11 | --- rustc-1.73.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs | 11 | --- a/compiler/rustc_codegen_llvm/src/context.rs |
12 | +++ rustc-1.73.0-src/compiler/rustc_codegen_llvm/src/context.rs | 12 | +++ b/compiler/rustc_codegen_llvm/src/context.rs |
13 | @@ -157,46 +157,6 @@ pub unsafe fn create_module<'ll>( | 13 | @@ -158,46 +158,6 @@ pub unsafe fn create_module<'ll>( |
14 | } | 14 | } |
15 | } | 15 | } |
16 | 16 | ||
17 | - // Ensure the data-layout values hardcoded remain the defaults. | 17 | - // Ensure the data-layout values hardcoded remain the defaults. |
18 | - if sess.target.is_builtin { | 18 | - if sess.target.is_builtin { |
19 | - // tm is disposed by its drop impl | ||
19 | - let tm = crate::back::write::create_informational_target_machine(tcx.sess); | 20 | - let tm = crate::back::write::create_informational_target_machine(tcx.sess); |
20 | - llvm::LLVMRustSetDataLayoutFromTargetMachine(llmod, tm); | 21 | - llvm::LLVMRustSetDataLayoutFromTargetMachine(llmod, &tm); |
21 | - llvm::LLVMRustDisposeTargetMachine(tm); | ||
22 | - | 22 | - |
23 | - let llvm_data_layout = llvm::LLVMGetDataLayoutStr(llmod); | 23 | - let llvm_data_layout = llvm::LLVMGetDataLayoutStr(llmod); |
24 | - let llvm_data_layout = str::from_utf8(CStr::from_ptr(llvm_data_layout).to_bytes()) | 24 | - let llvm_data_layout = str::from_utf8(CStr::from_ptr(llvm_data_layout).to_bytes()) |