about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src
diff options
context:
space:
mode:
authorJacob Pratt <jacob@jhpratt.dev>2025-02-12 20:10:00 -0500
committerGitHub <noreply@github.com>2025-02-12 20:10:00 -0500
commit33c186baf7f06ea7a5e7470b8a441af399d82a56 (patch)
tree554dde6bbfd173e9a306b40a70816b22ea1bc0b4 /compiler/rustc_codegen_llvm/src
parent03e2d7ebc5092f0476f017a5675ce14e2f1864b8 (diff)
parentbe1d6dfbfd841ed48b4b4fc8c3e42f6327723c90 (diff)
downloadrust-33c186baf7f06ea7a5e7470b8a441af399d82a56.tar.gz
rust-33c186baf7f06ea7a5e7470b8a441af399d82a56.zip
Rollup merge of #136807 - workingjubilee:merge-gpus-to-get-the-arcradeongeforce, r=bjorn3
compiler: internally merge `PtxKernel` into `GpuKernel`

r? ``@bjorn3`` for review
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
-rw-r--r--compiler/rustc_codegen_llvm/src/abi.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs
index 13846c8ab4b..28f423efc21 100644
--- a/compiler/rustc_codegen_llvm/src/abi.rs
+++ b/compiler/rustc_codegen_llvm/src/abi.rs
@@ -687,7 +687,6 @@ impl llvm::CallConv {
             Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt,
             Conv::ArmAapcs => llvm::ArmAapcsCallConv,
             Conv::Msp430Intr => llvm::Msp430Intr,
-            Conv::PtxKernel => llvm::PtxKernel,
             Conv::X86Fastcall => llvm::X86FastcallCallConv,
             Conv::X86Intr => llvm::X86_Intr,
             Conv::X86Stdcall => llvm::X86StdcallCallConv,