Skip to content

Commit 52382d6

Browse files
committed
Auto merge of #2569 - devnexen:linux_ptrace_peeksiginfo_args, r=Amanieu
linux/android add ptracec_peeksiginfo_args struct.
2 parents 4281f02 + 5731412 commit 52382d6

File tree

7 files changed

+22
-1
lines changed

7 files changed

+22
-1
lines changed

libc-test/build.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2846,6 +2846,7 @@ fn test_linux(target: &str) {
28462846
"linux/netlink.h",
28472847
// FIXME: requires more recent kernel headers:
28482848
// "linux/openat2.h",
2849+
[!musl]: "linux/ptrace.h",
28492850
"linux/quota.h",
28502851
"linux/random.h",
28512852
"linux/reboot.h",

libc-test/semver/android.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3056,6 +3056,7 @@ pthread_spin_unlock
30563056
pthread_spinlock_t
30573057
pthread_t
30583058
ptrace
3059+
ptrace_peeksiginfo_args
30593060
ptrdiff_t
30603061
ptsname
30613062
ptsname_r

libc-test/semver/linux-gnu.txt

+1
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,7 @@ pthread_rwlockattr_getkind_np
616616
pthread_rwlockattr_getpshared
617617
pthread_rwlockattr_setkind_np
618618
pthread_setname_np
619+
ptrace_peeksiginfo_args
619620
pututxline
620621
pwritev2
621622
pwritev64

src/unix/linux_like/android/mod.rs

+6
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,12 @@ s! {
349349
pub instruction_pointer: ::__u64,
350350
pub args: [::__u64; 6],
351351
}
352+
353+
pub struct ptrace_peeksiginfo_args {
354+
pub off: ::__u64,
355+
pub flags: ::__u32,
356+
pub nr: ::__s32,
357+
}
352358
}
353359

354360
s_no_extra_traits! {

src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ pub const POLLWRBAND: ::c_short = 0x100;
353353
pub const O_ASYNC: ::c_int = 0x40;
354354
pub const O_NDELAY: ::c_int = 0x4004;
355355

356-
pub const PTRACE_DETACH: ::c_uint = 11;
356+
pub const PTRACE_DETACH: ::c_uint = 17;
357357

358358
pub const EFD_NONBLOCK: ::c_int = 0x4000;
359359

src/unix/linux_like/linux/gnu/mod.rs

+6
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,12 @@ s! {
318318
pub semvmx: ::c_int,
319319
pub semaem: ::c_int,
320320
}
321+
322+
pub struct ptrace_peeksiginfo_args {
323+
pub off: ::__u64,
324+
pub flags: ::__u32,
325+
pub nr: ::__s32,
326+
}
321327
}
322328

323329
impl siginfo_t {

src/unix/linux_like/linux/uclibc/mod.rs

+6
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ s! {
7272
pub e_termination: ::c_short,
7373
pub e_exit: ::c_short,
7474
}
75+
76+
pub struct ptrace_peeksiginfo_args {
77+
pub off: ::__u64,
78+
pub flags: ::__u32,
79+
pub nr: ::__s32,
80+
}
7581
}
7682

7783
pub const MCL_CURRENT: ::c_int = 0x0001;

0 commit comments

Comments
 (0)