Merge #892

892: Fixed ptrace::Request cfg conditions r=asomers a=dalance The cfg condition of ptrace::Request seems to be different from libc. For example, PTRACE_GETREGS is defined by libc to i686-unknown-linux-gnu target, but it is not defined in ptrace::Request. I tried to change the cfg condition to the same as libc's condition. I thinks this change covers the definitions under src/unix/notbsd directory in libc repository. Co-authored-by: dalance <[email protected]>
nix-rust · Apr 29, 2018 · a773b88 · a773b88
2 parents 1b80024 + 1dda866
commit a773b88
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   `request_code_write`, and `request_code_readwrite` respectively. These have also now been exposed
   in the documentation.
   ([#833](https://github.com/nix-rust/nix/pull/833))
+- Enabled more `ptrace::Request` definitions for uncommon Linux platforms
+  ([#892](https://github.com/nix-rust/nix/pull/892))
 
 ### Fixed
 - Properly exposed 460800 and 921600 baud rates on NetBSD

diff --git a/src/sys/ptrace.rs b/src/sys/ptrace.rs
@@ -34,36 +34,76 @@ libc_enum!{
         PTRACE_CONT,
         PTRACE_KILL,
         PTRACE_SINGLESTEP,
-        #[cfg(all(any(target_env = "musl", target_arch ="x86_64", target_arch = "s390x"), not(target_os = "android")))]
+        #[cfg(any(all(target_os = "android", target_pointer_width = "32"),
+                  all(target_os = "linux", any(target_env = "musl",
+                                               target_arch = "mips",
+                                               target_arch = "mips64",
+                                               target_arch = "s390x",
+                                               target_arch = "x86_64",
+                                               target_pointer_width = "32"))))]
         PTRACE_GETREGS,
-        #[cfg(all(any(target_env = "musl", target_arch ="x86_64", target_arch = "s390x"), not(target_os = "android")))]
+        #[cfg(any(all(target_os = "android", target_pointer_width = "32"),
+                  all(target_os = "linux", any(target_env = "musl",
+                                               target_arch = "mips",
+                                               target_arch = "mips64",
+                                               target_arch = "s390x",
+                                               target_arch = "x86_64",
+                                               target_pointer_width = "32"))))]
         PTRACE_SETREGS,
-        #[cfg(all(any(target_env = "musl", target_arch ="x86_64", target_arch = "s390x"), not(target_os = "android")))]
+        #[cfg(any(all(target_os = "android", target_pointer_width = "32"),
+                  all(target_os = "linux", any(target_env = "musl",
+                                               target_arch = "mips",
+                                               target_arch = "mips64",
+                                               target_arch = "s390x",
+                                               target_arch = "x86_64",
+                                               target_pointer_width = "32"))))]
         PTRACE_GETFPREGS,
-        #[cfg(all(any(target_env = "musl", target_arch ="x86_64", target_arch = "s390x"), not(target_os = "android")))]
+        #[cfg(any(all(target_os = "android", target_pointer_width = "32"),
+                  all(target_os = "linux", any(target_env = "musl",
+                                               target_arch = "mips",
+                                               target_arch = "mips64",
+                                               target_arch = "s390x",
+                                               target_arch = "x86_64",
+                                               target_pointer_width = "32"))))]
         PTRACE_SETFPREGS,
         PTRACE_ATTACH,
         PTRACE_DETACH,
-        #[cfg(all(any(target_env = "musl", target_arch ="x86_64"), not(target_os = "android")))]
+        #[cfg(all(target_os = "linux", any(target_env = "musl",
+                                           target_arch = "mips",
+                                           target_arch = "mips64",
+                                           target_arch = "arm",
+                                           target_arch = "x86",
+                                           target_arch = "x86_64")))]
         PTRACE_GETFPXREGS,
-        #[cfg(all(any(target_env = "musl", target_arch ="x86_64"), not(target_os = "android")))]
+        #[cfg(all(target_os = "linux", any(target_env = "musl",
+                                           target_arch = "mips",
+                                           target_arch = "mips64",
+                                           target_arch = "arm",
+                                           target_arch = "x86",
+                                           target_arch = "x86_64")))]
         PTRACE_SETFPXREGS,
         PTRACE_SYSCALL,
         PTRACE_SETOPTIONS,
         PTRACE_GETEVENTMSG,
         PTRACE_GETSIGINFO,
         PTRACE_SETSIGINFO,
-        #[cfg(all(any(target_env = "musl", target_arch ="x86_64", target_arch = "s390x"), not(target_os = "android")))]
+        #[cfg(all(target_os = "linux", not(any(target_arch = "mips",
+                                               target_arch = "mips64"))))]
         PTRACE_GETREGSET,
-        #[cfg(all(any(target_env = "musl", target_arch ="x86_64", target_arch = "s390x"), not(target_os = "android")))]
+        #[cfg(all(target_os = "linux", not(any(target_arch = "mips",
+                                               target_arch = "mips64"))))]
         PTRACE_SETREGSET,
-        #[cfg(not(any(target_os = "android", target_arch = "mips", target_arch = "mips64")))]
+        #[cfg(all(target_os = "linux", not(any(target_arch = "mips",
+                                               target_arch = "mips64"))))]
         PTRACE_SEIZE,
-        #[cfg(not(any(target_os = "android", target_arch = "mips", target_arch = "mips64")))]
+        #[cfg(all(target_os = "linux", not(any(target_arch = "mips",
+                                               target_arch = "mips64"))))]
         PTRACE_INTERRUPT,
-        #[cfg(not(any(target_os = "android", target_arch = "mips", target_arch = "mips64")))]
+        #[cfg(all(target_os = "linux", not(any(target_arch = "mips",
+                                               target_arch = "mips64"))))]
         PTRACE_LISTEN,
-        #[cfg(not(any(target_os = "android", target_arch = "mips", target_arch = "mips64")))]
+        #[cfg(all(target_os = "linux", not(any(target_arch = "mips",
+                                               target_arch = "mips64"))))]
         PTRACE_PEEKSIGINFO,
     }
 }