diff options
| author | bors <bors@rust-lang.org> | 2023-08-21 06:00:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-21 06:00:57 +0000 |
| commit | 83ca92243ccbc0484b0c34371479db715ad79d9c (patch) | |
| tree | 7f576cc61c9908958d393f01133f5ccf0832579d /compiler/rustc_codegen_llvm | |
| parent | 92217bb93dc0b959efc83ce55dbe00f38e8307a1 (diff) | |
| parent | 5356aa43044e6e142985ff169bd14423220f34ff (diff) | |
| download | rust-83ca92243ccbc0484b0c34371479db715ad79d9c.tar.gz rust-83ca92243ccbc0484b0c34371479db715ad79d9c.zip | |
Auto merge of #3033 - rust-lang:rustup-2023-08-21, r=RalfJung
Automatic sync from rustc
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -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, |