Skip to content

Commit 6e82548

Browse files
committed
Auto merge of #2657 - devnexen:fbsd14_ptrace_regset_upd, r=Amanieu
freebsd 14 add new PT_GETREGSET/PT_SETREGSET flag
2 parents 34a9889 + 4bebc22 commit 6e82548

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ task:
4444
task:
4545
name: nightly x86_64-unknown-freebsd-14
4646
freebsd_instance:
47-
image: freebsd-14-0-current-amd64-v20220113
47+
image: freebsd-14-0-current-amd64-v20220203
4848
setup_script:
4949
- pkg install -y curl
5050
- curl https://sh.rustup.rs -sSf --output rustup.sh

libc-test/build.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -2155,7 +2155,11 @@ fn test_freebsd(target: &str) {
21552155
"MNT_UNTRUSTED" | "MNT_VERIFIED" if Some(12) > freebsd_ver => true,
21562156

21572157
// Added in FreeBSD 14.
2158-
"PT_COREDUMP" | "PC_ALL" | "PC_COMPRESS" if Some(14) > freebsd_ver => true,
2158+
"PT_COREDUMP" | "PC_ALL" | "PC_COMPRESS" | "PT_GETREGSET" | "PT_SETREGSET"
2159+
if Some(14) > freebsd_ver =>
2160+
{
2161+
true
2162+
}
21592163

21602164
// Added in FreeBSD 14.
21612165
"F_KINFO" => true, // FIXME: depends how frequent freebsd 14 is updated on CI, this addition went this week only.

src/unix/bsd/freebsdlike/freebsd/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -2317,6 +2317,8 @@ pub const PT_GETDBREGS: ::c_int = 37;
23172317
pub const PT_SETDBREGS: ::c_int = 38;
23182318
pub const PT_VM_TIMESTAMP: ::c_int = 40;
23192319
pub const PT_VM_ENTRY: ::c_int = 41;
2320+
pub const PT_GETREGSET: ::c_int = 42;
2321+
pub const PT_SETREGSET: ::c_int = 43;
23202322
pub const PT_FIRSTMACH: ::c_int = 64;
23212323

23222324
pub const PTRACE_EXEC: ::c_int = 0x0001;

0 commit comments

Comments
 (0)