File tree Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -69,8 +69,11 @@ fn main() {
6969 println ! ( "cargo:rustc-cfg=thumb_1" )
7070 }
7171
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+ {
7477 println ! ( "cargo:rustc-cfg=kernel_user_helpers" )
7578 }
7679}
Original file line number Diff line number Diff line change @@ -49,7 +49,11 @@ pub mod mem;
4949#[ cfg( target_arch = "arm" ) ]
5050pub mod arm;
5151
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+ ) ) ]
5357pub mod arm_linux;
5458
5559#[ cfg( any( target_arch = "riscv32" ) ) ]
You can’t perform that action at this time.
0 commit comments