diff options
| author | Michael Goulet <michael@errs.io> | 2023-11-22 09:28:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-22 09:28:51 -0800 |
| commit | dd9f3ad806029a520a67d911493844c91fff5d1f (patch) | |
| tree | 17058d46fe087c52bcfd42864fda1a518df487fd /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | 90f04e1b4da34990df2a4b8e1c521d8f93acb10f (diff) | |
| parent | e6f8edff3734ecfa55159da63343fbea3f1ee3a5 (diff) | |
| download | rust-dd9f3ad806029a520a67d911493844c91fff5d1f.tar.gz rust-dd9f3ad806029a520a67d911493844c91fff5d1f.zip | |
Rollup merge of #118142 - saethlin:llvm-linkage, r=tmiasko
Tighten up link attributes for llvm-wrapper bindings Fixes https://github.com/rust-lang/rust/issues/118084 by moving all of the declarations of symbols from `llvm_rust` into a separate extern block with `#[link(name = "llvm-wrapper", kind = "static")]`. This also renames `LLVMTimeTraceProfiler*` to `LLVMRustTimeTraceProfiler*` because those are functions from `llvm_rust`. r? tmiasko
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 156c9b76417..eb69efb0d59 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -121,7 +121,7 @@ unsafe fn configure_llvm(sess: &Session) { } if sess.opts.unstable_opts.llvm_time_trace { - llvm::LLVMTimeTraceProfilerInitialize(); + llvm::LLVMRustTimeTraceProfilerInitialize(); } rustc_llvm::initialize_available_targets(); @@ -132,7 +132,7 @@ unsafe fn configure_llvm(sess: &Session) { pub fn time_trace_profiler_finish(file_name: &Path) { unsafe { let file_name = path_to_c_string(file_name); - llvm::LLVMTimeTraceProfilerFinish(file_name.as_ptr()); + llvm::LLVMRustTimeTraceProfilerFinish(file_name.as_ptr()); } } |