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.

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;