Skip to content

Commit 4281f02

Browse files
committed
Auto merge of #2417 - devnexen:user_regs_struct_arm64, r=Amanieu
linux/android aarch64 add user_regs_struct and user_fpsimd_struct
2 parents c0cbbbe + d99d8b5 commit 4281f02

File tree

6 files changed

+24
-0
lines changed

6 files changed

+24
-0
lines changed

libc-test/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,6 +1537,7 @@ fn test_android(target: &str) {
15371537
"sys/ucontext.h",
15381538
"sys/uio.h",
15391539
"sys/un.h",
1540+
"sys/user.h",
15401541
"sys/utsname.h",
15411542
"sys/vfs.h",
15421543
"sys/xattr.h",

libc-test/semver/android-aarch64.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ SYS_arch_specific_syscall
1111
SYS_syscalls
1212
SYS_fcntl
1313
__system_property_wait
14+
user_regs_struct

libc-test/semver/linux-aarch64.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,4 @@ ip_mreqn
9191
max_align_t
9292
mcontext_t
9393
ucontext_t
94+
user_regs_struct

src/unix/linux_like/android/b64/aarch64/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ s! {
4848
__unused4: ::c_uint,
4949
__unused5: ::c_uint,
5050
}
51+
52+
pub struct user_regs_struct {
53+
pub regs: [u64; 31],
54+
pub sp: u64,
55+
pub pc: u64,
56+
pub pstate: u64,
57+
}
5158
}
5259

5360
pub const O_DIRECT: ::c_int = 0x10000;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,13 @@ s! {
142142
__size: [usize; 8]
143143
}
144144

145+
pub struct user_regs_struct {
146+
pub regs: [::c_ulonglong; 31],
147+
pub sp: ::c_ulonglong,
148+
pub pc: ::c_ulonglong,
149+
pub pstate: ::c_ulonglong,
150+
}
151+
145152
pub struct ipc_perm {
146153
pub __key: ::key_t,
147154
pub uid: ::uid_t,

src/unix/linux_like/linux/musl/b64/aarch64/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ s! {
4949
__unused: [::c_uint; 2],
5050
}
5151

52+
pub struct user_regs_struct {
53+
pub regs: [::c_ulonglong; 31],
54+
pub sp: ::c_ulonglong,
55+
pub pc: ::c_ulonglong,
56+
pub pstate: ::c_ulonglong,
57+
}
58+
5259
pub struct ipc_perm {
5360
pub __ipc_perm_key: ::key_t,
5461
pub uid: ::uid_t,

0 commit comments

Comments
 (0)