Merge #1176

1176: Add RISC-V support on GNU/Linux r=asomers a=msizanoen1 Co-authored-by: msizanoen1 <[email protected]>
nix-rust · Feb 2, 2020 · d401c6f · d401c6f
2 parents b23e8e5 + 10e69db
commit d401c6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/sys/ioctl/linux.rs b/src/sys/ioctl/linux.rs
@@ -33,7 +33,8 @@ mod consts {
           target_arch = "arm",
           target_arch = "s390x",
           target_arch = "x86_64",
-          target_arch = "aarch64"))]
+          target_arch = "aarch64",
+          target_arch = "riscv64"))]
 mod consts {
     #[doc(hidden)]
     pub const NONE: u8 = 0;

diff --git a/src/sys/ptrace/linux.rs b/src/sys/ptrace/linux.rs
@@ -46,27 +46,31 @@ libc_enum!{
                                                target_arch = "mips",
                                                target_arch = "mips64",
                                                target_arch = "x86_64",
+                                               target_arch = "riscv64",
                                                target_pointer_width = "32"))))]
         PTRACE_GETREGS,
         #[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 = "x86_64",
+                                               target_arch = "riscv64",
                                                target_pointer_width = "32"))))]
         PTRACE_SETREGS,
         #[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 = "x86_64",
+                                               target_arch = "riscv64",
                                                target_pointer_width = "32"))))]
         PTRACE_GETFPREGS,
         #[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 = "x86_64",
+                                               target_arch = "riscv64",
                                                target_pointer_width = "32"))))]
         PTRACE_SETFPREGS,
         PTRACE_ATTACH,
@@ -75,13 +79,15 @@ libc_enum!{
                                            target_arch = "mips",
                                            target_arch = "mips64",
                                            target_arch = "x86",
-                                           target_arch = "x86_64")))]
+                                           target_arch = "x86_64",
+                                           target_arch = "riscv64")))]
         PTRACE_GETFPXREGS,
         #[cfg(all(target_os = "linux", any(target_env = "musl",
                                            target_arch = "mips",
                                            target_arch = "mips64",
                                            target_arch = "x86",
-                                           target_arch = "x86_64")))]
+                                           target_arch = "x86_64",
+                                           target_arch = "riscv64")))]
         PTRACE_SETFPXREGS,
         PTRACE_SYSCALL,
         PTRACE_SETOPTIONS,