diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2017-07-09 16:23:25 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2017-07-09 16:23:25 +0000 |
commit | 1b1f15c27c73197bc256220644440a2d0874d9aa (patch) | |
tree | ee1c727795207605f07dd0a1a041316b18adb5aa /src/sys | |
parent | 930de3811f024d7e6e5fda3da527d122f9a24279 (diff) | |
parent | 0bf5af584c11ffa22c452fb89dcbea70c03e018c (diff) | |
download | nix-1b1f15c27c73197bc256220644440a2d0874d9aa.zip |
Merge #624
624: Enable ptrace on all Linux platforms r=Susurrus
Nothing that nix currently binds is architecture-specific, and Android
supports ptrace just as much as non-Android Linux.
Diffstat (limited to 'src/sys')
-rw-r--r-- | src/sys/mod.rs | 6 | ||||
-rw-r--r-- | src/sys/ptrace.rs | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/sys/mod.rs b/src/sys/mod.rs index 69632f00..783b8364 100644 --- a/src/sys/mod.rs +++ b/src/sys/mod.rs @@ -52,11 +52,7 @@ pub mod uio; pub mod time; -#[cfg(all(target_os = "linux", - any(target_arch = "x86", - target_arch = "x86_64", - target_arch = "arm")), - )] +#[cfg(any(target_os = "linux", target_os = "android"))] pub mod ptrace; pub mod select; diff --git a/src/sys/ptrace.rs b/src/sys/ptrace.rs index 17dfee34..bf395259 100644 --- a/src/sys/ptrace.rs +++ b/src/sys/ptrace.rs @@ -3,11 +3,6 @@ use {Errno, Error, Result}; use libc::{c_void, c_long, siginfo_t}; use ::unistd::Pid; -#[cfg(all(target_os = "linux", - any(target_arch = "x86", - target_arch = "x86_64", - target_arch = "arm")), - )] pub mod ptrace { use libc::c_int; |