File tree 2 files changed +10
-3
lines changed
2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -69,8 +69,11 @@ fn main() {
69
69
println ! ( "cargo:rustc-cfg=thumb_1" )
70
70
}
71
71
72
- // Only emit the ARM Linux atomic emulation on pre-ARMv6 architectures.
73
- if llvm_target[ 0 ] == "armv4t" || llvm_target[ 0 ] == "armv5te" {
72
+ // Only emit the ARM Linux atomic emulation on pre-ARMv6 architectures. This
73
+ // includes the old androideabi. It is deprecated but it is available as a
74
+ // rustc target (arm-linux-androideabi).
75
+ if llvm_target[ 0 ] == "armv4t" || llvm_target[ 0 ] == "armv5te" || llvm_target[ 2 ] == "androideabi"
76
+ {
74
77
println ! ( "cargo:rustc-cfg=kernel_user_helpers" )
75
78
}
76
79
}
Original file line number Diff line number Diff line change @@ -49,7 +49,11 @@ pub mod mem;
49
49
#[ cfg( target_arch = "arm" ) ]
50
50
pub mod arm;
51
51
52
- #[ cfg( all( kernel_user_helpers, target_os = "linux" , target_arch = "arm" ) ) ]
52
+ #[ cfg( all(
53
+ kernel_user_helpers,
54
+ any( target_os = "linux" , target_os = "android" ) ,
55
+ target_arch = "arm"
56
+ ) ) ]
53
57
pub mod arm_linux;
54
58
55
59
#[ cfg( any( target_arch = "riscv32" ) ) ]
You can’t perform that action at this time.
0 commit comments