diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2025-01-19 05:15:09 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2025-01-19 05:15:09 +0000 |
| commit | 96788aa2b511d7cbe3d15a48ac17944de8089c2d (patch) | |
| tree | beb42229e380a5c8038e2692ba05a951351648b5 /compiler/rustc_codegen_llvm/src/context.rs | |
| parent | 5a64c2a592431b0de138b32f1d49f69ec6c4e01b (diff) | |
| parent | 01706e1a34c87656fcbfce198608f4cd2ac6461a (diff) | |
| download | rust-96788aa2b511d7cbe3d15a48ac17944de8089c2d.tar.gz rust-96788aa2b511d7cbe3d15a48ac17944de8089c2d.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/context.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index d8fbe51b975..65345751842 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -741,7 +741,10 @@ impl<'ll, 'tcx> MiscCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> { if self.get_declared_value(entry_name).is_none() { Some(self.declare_entry_fn( entry_name, - self.sess().target.entry_abi.into(), + llvm::CallConv::from_conv( + self.sess().target.entry_abi, + self.sess().target.arch.borrow(), + ), llvm::UnnamedAddr::Global, fn_type, )) |