--- qemu-20230327/linux-user/syscall_defs.h.orig	2023-03-27 15:41:42.000000000 +0200
+++ qemu-20230327/linux-user/syscall_defs.h	2023-04-01 12:20:09.641848846 +0200
@@ -1336,7 +1336,7 @@ struct target_stat { // #elif defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
     abi_uint        st_dev;
     abi_ulong       st_ino;
     abi_uint        st_mode;
-    abi_uint        st_nlink;
+    abi_short       st_nlink;
     abi_uint        st_uid;
     abi_uint        st_gid;
     abi_uint        st_rdev;
@@ -1351,8 +1351,7 @@ struct target_stat {
 
 #define TARGET_HAS_STRUCT_STAT64
 struct target_stat64 {
-    unsigned char   __pad0[6];
-    abi_ushort      st_dev;
+    abi_ullong      st_dev;
 
     abi_ullong      st_ino;
     abi_ullong      st_nlink;
@@ -1362,14 +1361,13 @@ struct target_stat64 {
     abi_uint        st_uid;
     abi_uint        st_gid;
 
-    unsigned char   __pad2[6];
-    abi_ushort      st_rdev;
+    abi_uint        __pda0;
+    abi_ullong      st_rdev;
 
     abi_llong       st_size;
     abi_llong       st_blksize;
 
-    unsigned char   __pad4[4];
-    abi_uint        st_blocks;
+    abi_llong       st_blocks;
 
     abi_ulong       target_st_atime;
     abi_ulong       target_st_atime_nsec;
@@ -1408,8 +1406,7 @@ struct target_stat {
 
 #define TARGET_HAS_STRUCT_STAT64
 struct target_stat64 {
-    unsigned char   __pad0[6];
-    abi_ushort      st_dev;
+    abi_ullong      st_dev;
 
     abi_ullong      st_ino;
 
@@ -1419,8 +1416,7 @@ struct target_stat64 {
     abi_uint        st_uid;
     abi_uint        st_gid;
 
-    unsigned char   __pad2[6];
-    abi_ushort      st_rdev;
+    abi_ullong      st_rdev;
 
     unsigned char   __pad3[8];