Auto merge of #2607 - devnexen:user_fpsimd_struct_arm64, r=Amanieu

linux glibc add user_fpsimd_struct struct
rust-lang · May 28, 2022 · 51d07d5 · 51d07d5
2 parents 178efa9 + a00785a
commit 51d07d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -3490,7 +3490,9 @@ fn test_linux(target: &str) {
             && ((x86_64 || i686 || arm || riscv64) && gnu || x86_64_gnux32)
         ) ||
         // the `u` field is in fact an anonymous union
-        (gnu && struct_ == "ptrace_syscall_info" && (field == "u" || field == "pad"))
+        (gnu && struct_ == "ptrace_syscall_info" && (field == "u" || field == "pad")) ||
+        // the vregs field is a `__uint128_t` C's type.
+        (struct_ == "user_fpsimd_struct" && field == "vregs")
     });
 
     cfg.skip_roundtrip(move |s| match s {

diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs
@@ -26,4 +26,12 @@ s! {
         // auto-derive traits like Debug
         __reserved: [[u64; 32]; 16],
     }
+
+    #[repr(align(16))]
+    pub struct user_fpsimd_struct {
+        pub vregs: [[u64; 2]; 32],
+        pub fpsr: ::c_uint,
+        pub fpcr: ::c_uint,
+    }
+
 }