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.
This commit is contained in:
commit
0ba07e4926
4
build.rs
4
build.rs
@ -52,8 +52,8 @@ fn main() {
|
||||
}
|
||||
|
||||
// Only emit the ARM Linux atomic emulation on pre-ARMv6 architectures.
|
||||
if llvm_target[0] == "armv5te" {
|
||||
println!("cargo:rustc-cfg=armv5te")
|
||||
if llvm_target[0] == "armv4t" || llvm_target[0] == "armv5te" {
|
||||
println!("cargo:rustc-cfg=kernel_user_helpers")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -52,7 +52,7 @@ pub mod mem;
|
||||
#[cfg(target_arch = "arm")]
|
||||
pub mod arm;
|
||||
|
||||
#[cfg(all(armv5te, target_os = "linux", target_arch = "arm"))]
|
||||
#[cfg(all(kernel_user_helpers, target_os = "linux", target_arch = "arm"))]
|
||||
pub mod arm_linux;
|
||||
|
||||
#[cfg(target_arch = "x86")]
|
||||
|
Loading…
Reference in New Issue
Block a user