Skip to content

Commit dcbd1ff

Browse files
committed
Auto merge of #220 - malbarbo:armv4t, r=alexcrichton
Use kernel user helpers for armv4t Rename armv5te cfg to kernel_user_helpers and enable it for armv4t.
2 parents a076c9a + f4edcf7 commit dcbd1ff

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ fn main() {
5252
}
5353

5454
// Only emit the ARM Linux atomic emulation on pre-ARMv6 architectures.
55-
if llvm_target[0] == "armv5te" {
56-
println!("cargo:rustc-cfg=armv5te")
55+
if llvm_target[0] == "armv4t" || llvm_target[0] == "armv5te" {
56+
println!("cargo:rustc-cfg=kernel_user_helpers")
5757
}
5858
}
5959

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ pub mod mem;
5252
#[cfg(target_arch = "arm")]
5353
pub mod arm;
5454

55-
#[cfg(all(armv5te, target_os = "linux", target_arch = "arm"))]
55+
#[cfg(all(kernel_user_helpers, target_os = "linux", target_arch = "arm"))]
5656
pub mod arm_linux;
5757

5858
#[cfg(target_arch = "x86")]

0 commit comments

Comments
 (0)