@@ -250,11 +250,11 @@ macro_rules! intrinsics {
250
250
$( $body) *
251
251
}
252
252
253
- #[ cfg( all( any( windows, target_os = "uefi" ) , target_arch = "x86_64" ) ) ]
254
- pub mod $name {
255
- #[ cfg_attr ( not ( feature = "mangled-names" ) , no_mangle) ]
253
+ #[ cfg( all( any( windows, target_os = "uefi" ) , target_arch = "x86_64" , not ( feature = "mangled-names" ) ) ) ]
254
+ mod $name {
255
+ #[ no_mangle]
256
256
#[ cfg_attr( all( not( windows) , not( target_vendor = "apple" ) ) , linkage = "weak" ) ]
257
- pub extern $abi fn $name( $( $argname: $ty) ,* )
257
+ extern $abi fn $name( $( $argname: $ty) ,* )
258
258
-> $crate:: macros:: win64_128bit_abi_hack:: U64x2
259
259
{
260
260
let e: $( $ret) ? = super :: $name( $( $argname) ,* ) ;
@@ -291,20 +291,20 @@ macro_rules! intrinsics {
291
291
$( $body) *
292
292
}
293
293
294
- #[ cfg( target_arch = "arm" ) ]
295
- pub mod $name {
296
- #[ cfg_attr ( not ( feature = "mangled-names" ) , no_mangle) ]
294
+ #[ cfg( all ( target_arch = "arm" , not ( feature = "mangled-names" ) ) ) ]
295
+ mod $name {
296
+ #[ no_mangle]
297
297
#[ cfg_attr( all( not( windows) , not( target_vendor = "apple" ) ) , linkage = "weak" ) ]
298
- pub extern $abi fn $name( $( $argname: $ty) ,* ) $( -> $ret) ? {
298
+ extern $abi fn $name( $( $argname: $ty) ,* ) $( -> $ret) ? {
299
299
super :: $name( $( $argname) ,* )
300
300
}
301
301
}
302
302
303
- #[ cfg( target_arch = "arm" ) ]
304
- pub mod $alias {
305
- #[ cfg_attr ( not ( feature = "mangled-names" ) , no_mangle) ]
303
+ #[ cfg( all ( target_arch = "arm" , not ( feature = "mangled-names" ) ) ) ]
304
+ mod $alias {
305
+ #[ no_mangle]
306
306
#[ cfg_attr( all( not( windows) , not( target_vendor="apple" ) ) , linkage = "weak" ) ]
307
- pub extern "aapcs" fn $alias( $( $argname: $ty) ,* ) $( -> $ret) ? {
307
+ extern "aapcs" fn $alias( $( $argname: $ty) ,* ) $( -> $ret) ? {
308
308
super :: $name( $( $argname) ,* )
309
309
}
310
310
}
@@ -335,12 +335,12 @@ macro_rules! intrinsics {
335
335
$( $body) *
336
336
}
337
337
338
- #[ cfg( feature = "mem" ) ]
339
- pub mod $name {
338
+ #[ cfg( all ( feature = "mem" , not ( feature = "mangled-names" ) ) ) ]
339
+ mod $name {
340
340
$( #[ $( $attr) * ] ) *
341
- #[ cfg_attr ( not ( feature = "mangled-names" ) , no_mangle) ]
341
+ #[ no_mangle]
342
342
#[ cfg_attr( all( not( windows) , not( target_vendor = "apple" ) ) , linkage = "weak" ) ]
343
- pub unsafe extern $abi fn $name( $( $argname: $ty) ,* ) $( -> $ret) ? {
343
+ unsafe extern $abi fn $name( $( $argname: $ty) ,* ) $( -> $ret) ? {
344
344
super :: $name( $( $argname) ,* )
345
345
}
346
346
}
@@ -359,6 +359,7 @@ macro_rules! intrinsics {
359
359
360
360
$( $rest: tt) *
361
361
) => (
362
+ // `#[naked]` definitions are referenced by other places, so we can't use `cfg` like the others
362
363
pub mod $name {
363
364
#[ naked]
364
365
$( #[ $( $attr) * ] ) *
@@ -426,11 +427,12 @@ macro_rules! intrinsics {
426
427
$( $body) *
427
428
}
428
429
429
- pub mod $name {
430
+ #[ cfg( not( feature = "mangled-names" ) ) ]
431
+ mod $name {
430
432
$( #[ $( $attr) * ] ) *
431
- #[ cfg_attr ( not ( feature = "mangled-names" ) , no_mangle) ]
433
+ #[ no_mangle]
432
434
#[ cfg_attr( all( not( windows) , not( target_vendor = "apple" ) ) , linkage = "weak" ) ]
433
- pub extern $abi fn $name( $( $argname: $ty) ,* ) $( -> $ret) ? {
435
+ extern $abi fn $name( $( $argname: $ty) ,* ) $( -> $ret) ? {
434
436
super :: $name( $( $argname) ,* )
435
437
}
436
438
}
@@ -452,11 +454,12 @@ macro_rules! intrinsics {
452
454
$( $body) *
453
455
}
454
456
455
- pub mod $name {
457
+ #[ cfg( not( feature = "mangled-names" ) ) ]
458
+ mod $name {
456
459
$( #[ $( $attr) * ] ) *
457
- #[ cfg_attr ( not ( feature = "mangled-names" ) , no_mangle) ]
460
+ #[ no_mangle]
458
461
#[ cfg_attr( all( not( windows) , not( target_vendor = "apple" ) ) , linkage = "weak" ) ]
459
- pub unsafe extern $abi fn $name( $( $argname: $ty) ,* ) $( -> $ret) ? {
462
+ unsafe fn $name( $( $argname: $ty) ,* ) $( -> $ret) ? {
460
463
super :: $name( $( $argname) ,* )
461
464
}
462
465
}
0 commit comments