@@ -251,27 +251,26 @@ pub fn conv_to_fn_attribute<'gcc>(conv: Conv, arch: &str) -> Option<FnAttribute<
251
251
Conv :: PreserveMost => return None ,
252
252
Conv :: PreserveAll => return None ,
253
253
Conv :: GpuKernel => {
254
- // TODO(antoyo): remove clippy allow attribute when this is implemented.
255
- #[ allow( clippy:: if_same_then_else) ]
256
254
if arch == "amdgpu" {
257
- return None ;
255
+ FnAttribute :: GcnAmdGpuHsaKernel
258
256
} else if arch == "nvptx64" {
259
- return None ;
257
+ FnAttribute :: NvptxKernel
260
258
} else {
261
259
panic ! ( "Architecture {} does not support GpuKernel calling convention" , arch) ;
262
260
}
263
261
}
264
- Conv :: AvrInterrupt => return None ,
265
- Conv :: AvrNonBlockingInterrupt => return None ,
266
- Conv :: ArmAapcs => return None ,
267
- Conv :: Msp430Intr => return None ,
268
- Conv :: X86Fastcall => return None ,
269
- Conv :: X86Intr => return None ,
270
- Conv :: X86Stdcall => return None ,
271
- Conv :: X86ThisCall => return None ,
262
+ // TODO(antoyo): check if those AVR attributes are mapped correctly.
263
+ Conv :: AvrInterrupt => FnAttribute :: AvrSignal ,
264
+ Conv :: AvrNonBlockingInterrupt => FnAttribute :: AvrInterrupt ,
265
+ Conv :: ArmAapcs => FnAttribute :: ArmPcs ( "aapcs" ) ,
266
+ Conv :: Msp430Intr => FnAttribute :: Msp430Interrupt ,
267
+ Conv :: X86Fastcall => FnAttribute :: X86FastCall ,
268
+ Conv :: X86Intr => FnAttribute :: X86Interrupt ,
269
+ Conv :: X86Stdcall => FnAttribute :: X86Stdcall ,
270
+ Conv :: X86ThisCall => FnAttribute :: X86ThisCall ,
272
271
Conv :: X86VectorCall => return None ,
273
- Conv :: X86_64SysV => FnAttribute :: SysvAbi ,
274
- Conv :: X86_64Win64 => FnAttribute :: MsAbi ,
272
+ Conv :: X86_64SysV => FnAttribute :: X86SysvAbi ,
273
+ Conv :: X86_64Win64 => FnAttribute :: X86MsAbi ,
275
274
} ;
276
275
Some ( attribute)
277
276
}
0 commit comments