diff options
| author | bors <bors@rust-lang.org> | 2023-08-18 13:20:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-18 13:20:37 +0000 |
| commit | 2ceed0b6cb9e9866225d7cfcfcbb4a62db047163 (patch) | |
| tree | 833de9b4a0246e7b56bee2a4cc1110f1a97c11f6 /compiler/rustc_codegen_llvm/src/attributes.rs | |
| parent | b9177c0adb1ccae97145569c954696a4c680f5b3 (diff) | |
| parent | 3bd54c14bcf74bd5beedbfdb1300626e2a649659 (diff) | |
| download | rust-2ceed0b6cb9e9866225d7cfcfcbb4a62db047163.tar.gz rust-2ceed0b6cb9e9866225d7cfcfcbb4a62db047163.zip | |
Auto merge of #113814 - ChoKyuWon:master, r=davidtwco
Replace the \01__gnu_mcount_nc to LLVM intrinsic for ARM Current `-Zinstrument-mcount` for ARM32 use the `\01__gnu_mcount_nc` directly for its instrumentation function. However, the LLVM does not use this mcount function directly, but it wraps it to intrinsic, `llvm.arm.gnu.eabi.mcount` and the transform pass also only handle the intrinsic. As a result, current `-Zinstrument-mcount` not work on ARM32. Refer: https://github.com/namhyung/uftrace/issues/1764 This commit replaces the mcount name from native function to the LLVM intrinsic so that the transform pass can handle it.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/attributes.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/attributes.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/attributes.rs b/compiler/rustc_codegen_llvm/src/attributes.rs index 4c9094bf1f5..b6c01545f30 100644 --- a/compiler/rustc_codegen_llvm/src/attributes.rs +++ b/compiler/rustc_codegen_llvm/src/attributes.rs @@ -128,7 +128,10 @@ fn instrument_function_attr<'ll>(cx: &CodegenCx<'ll, '_>) -> SmallVec<[&'ll Attr // The function name varies on platforms. // See test/CodeGen/mcount.c in clang. - let mcount_name = cx.sess().target.mcount.as_ref(); + let mcount_name = match &cx.sess().target.llvm_mcount_intrinsic { + Some(llvm_mcount_intrinsic) => llvm_mcount_intrinsic.as_ref(), + None => cx.sess().target.mcount.as_ref(), + }; attrs.push(llvm::CreateAttrStringValue( cx.llcx, |