aarch64-linux-gnu: avoid double exporting of user_fpsimd_struct

rust-lang · Aug 14, 2023 · 3d48e04 · 3d48e04
1 parent 6652fe1
commit 3d48e04
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs
@@ -27,13 +27,6 @@ s! {
         __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,
-    }
-
     #[repr(align(8))]
     pub struct clone_args {
         pub flags: ::c_ulonglong,

diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/glibc_fpsimd.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/glibc_fpsimd.rs
@@ -0,0 +1,8 @@
+s! {
+    #[repr(align(16))]
+    pub struct user_fpsimd_struct {
+        pub vregs: [[u64; 2]; 32],
+        pub fpsr: ::c_uint,
+        pub fpcr: ::c_uint,
+    }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
@@ -934,5 +934,8 @@ cfg_if! {
     if #[cfg(libc_int128)] {
         mod int128;
         pub use self::int128::*;
+    } else {
+        mod glibc_fpsimd;
+        pub use self::glibc_fpsimd::*;
     }
 }