From 52102cb76398c4dfb9ea141b98c5b01a2e050973 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Tue, 21 May 2019 19:51:00 -0600 Subject: [PATCH] Merge r196b05b5c from master commit 196b05b5c7be39b73dcadca5457948d807fdf913 (fpxregs) Author: Alan Somers Date: Fri May 17 14:59:36 2019 -0600 Fix build on arm and s390x after recent libc changes libc just removed some symbols on linux/arm32 and linux/s390x that never should've been defined in the first place. https://github.com/rust-lang/libc/commit/24f8972b8d2d915b1687fc8197e1ed95e349a82e https://github.com/rust-lang/libc/commit/d2695436ba5072078796c76f727a296e0f43caa6 --- src/sys/ptrace.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/sys/ptrace.rs b/src/sys/ptrace.rs index 4bb7e06f60..17156ef24c 100644 --- a/src/sys/ptrace.rs +++ b/src/sys/ptrace.rs @@ -38,7 +38,6 @@ libc_enum!{ 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, @@ -46,7 +45,6 @@ libc_enum!{ 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, @@ -54,7 +52,6 @@ libc_enum!{ 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, @@ -62,7 +59,6 @@ libc_enum!{ 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, @@ -71,14 +67,12 @@ libc_enum!{ #[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(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,