diff options
| author | bors <bors@rust-lang.org> | 2024-01-31 15:01:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-31 15:01:22 +0000 |
| commit | 11f32b73e0dc9287e305b5b9980d24aecdc8c17f (patch) | |
| tree | f07778f3d4e79d2973013519118772697cd03e3b /compiler/rustc_codegen_llvm | |
| parent | cdaa12e3dff109f72a5a8a0a67ea225052122a79 (diff) | |
| parent | 4eaf4c261511295483757df8f01f28e0d19349ca (diff) | |
| download | rust-11f32b73e0dc9287e305b5b9980d24aecdc8c17f.tar.gz rust-11f32b73e0dc9287e305b5b9980d24aecdc8c17f.zip | |
Auto merge of #120524 - Nadrieril:rollup-67952ib, r=Nadrieril
Rollup of 9 pull requests Successful merges: - #120207 (check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test) - #120321 (pattern_analysis: cleanup the contexts) - #120355 (document `FromIterator for Vec` allocation behaviors) - #120430 (std: thread_local::register_dtor fix proposal for FreeBSD.) - #120469 (Provide more context on derived obligation error primary label) - #120472 (Make duplicate lang items fatal) - #120490 (Don't hash lints differently to non-lints.) - #120495 (Remove the `abi_amdgpu_kernel` feature) - #120501 (rustdoc: Correctly handle attribute merge if this is a glob reexport) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/abi.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs index 0718bebb31b..b5b4f894e4d 100644 --- a/compiler/rustc_codegen_llvm/src/abi.rs +++ b/compiler/rustc_codegen_llvm/src/abi.rs @@ -590,7 +590,6 @@ impl From<Conv> for llvm::CallConv { Conv::Cold => llvm::ColdCallConv, Conv::PreserveMost => llvm::PreserveMost, Conv::PreserveAll => llvm::PreserveAll, - Conv::AmdGpuKernel => llvm::AmdGpuKernel, Conv::AvrInterrupt => llvm::AvrInterrupt, Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt, Conv::ArmAapcs => llvm::ArmAapcsCallConv, diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index ee73c6b4756..4ad44a42738 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -106,7 +106,6 @@ pub enum CallConv { X86_Intr = 83, AvrNonBlockingInterrupt = 84, AvrInterrupt = 85, - AmdGpuKernel = 91, } /// LLVMRustLinkage |