--- 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
@@ -61,7 +61,6 @@
 
 #if (defined(TARGET_I386) && defined(TARGET_ABI32)) \
     || (defined(TARGET_ARM) && defined(TARGET_ABI32)) \
-    || defined(TARGET_SPARC) \
     || defined(TARGET_M68K) || defined(TARGET_SH4) || defined(TARGET_CRIS)
     /* 16 bit uid wrappers emulation */
 #define USE_UID16
@@ -1447,13 +1446,13 @@ struct target_eabi_stat64 {
 
 #elif defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
 struct target_stat {
-	unsigned int	st_dev;
+	abi_uint	st_dev;
 	abi_ulong	st_ino;
-	unsigned int	st_mode;
-	unsigned int	st_nlink;
-	unsigned int	st_uid;
-	unsigned int	st_gid;
-	unsigned int	st_rdev;
+	abi_uint	st_mode;
+	abi_short	st_nlink;
+	abi_uint	st_uid;
+	abi_uint	st_gid;
+	abi_uint	st_rdev;
 	abi_long	st_size;
 	abi_long	target_st_atime;
 	abi_long	target_st_mtime;
@@ -1465,25 +1464,23 @@ struct target_stat {
 
 #define TARGET_HAS_STRUCT_STAT64
 struct target_stat64 {
-	unsigned char	__pad0[6];
-	unsigned short	st_dev;
+	abi_ullong	st_dev;
 
-	uint64_t	st_ino;
-	uint64_t	st_nlink;
+	abi_ullong	st_ino;
+	abi_ullong	st_nlink;
 
-	unsigned int	st_mode;
+	abi_uint	st_mode;
 
-	unsigned int	st_uid;
-	unsigned int	st_gid;
+	abi_uint	st_uid;
+	abi_uint	st_gid;
 
-	unsigned char	__pad2[6];
-	unsigned short	st_rdev;
+	abi_uint	__pad0;
+	abi_ullong	st_rdev;
 
-        int64_t		st_size;
-	int64_t		st_blksize;
+	abi_llong	st_size;
+	abi_llong	st_blksize;
 
-	unsigned char	__pad4[4];
-	unsigned int	st_blocks;
+	abi_llong	st_blocks;
 
 	abi_ulong	target_st_atime;
 	abi_ulong	target_st_atime_nsec;
@@ -1501,13 +1498,13 @@ struct target_stat64 {
 
 #define TARGET_STAT_HAVE_NSEC
 struct target_stat {
-	unsigned short	st_dev;
+	abi_ushort	st_dev;
 	abi_ulong	st_ino;
-	unsigned short	st_mode;
-	short		st_nlink;
-	unsigned short	st_uid;
-	unsigned short	st_gid;
-	unsigned short	st_rdev;
+	abi_ushort	st_mode;
+	abi_short	st_nlink;
+	abi_ushort	st_uid;
+	abi_ushort	st_gid;
+	abi_ushort	st_rdev;
 	abi_long	st_size;
 	abi_long	target_st_atime;
 	abi_ulong	target_st_atime_nsec;
@@ -1522,39 +1519,37 @@ struct target_stat {
 
 #define TARGET_HAS_STRUCT_STAT64
 struct target_stat64 {
-	unsigned char	__pad0[6];
-	unsigned short	st_dev;
+	abi_ullong st_dev;
 
-	uint64_t st_ino;
+	abi_ullong st_ino;
 
-	unsigned int	st_mode;
-	unsigned int	st_nlink;
+	abi_uint	st_mode;
+	abi_uint	st_nlink;
 
-	unsigned int	st_uid;
-	unsigned int	st_gid;
+	abi_uint	st_uid;
+	abi_uint	st_gid;
 
-	unsigned char	__pad2[6];
-	unsigned short	st_rdev;
+	abi_ullong        st_rdev;
 
 	unsigned char	__pad3[8];
 
-        int64_t	st_size;
-	unsigned int	st_blksize;
+        abi_llong	st_size;
+	abi_uint	st_blksize;
 
 	unsigned char	__pad4[8];
-	unsigned int	st_blocks;
+	abi_uint	st_blocks;
 
-	unsigned int	target_st_atime;
-	unsigned int	target_st_atime_nsec;
+	abi_uint	target_st_atime;
+	abi_uint	target_st_atime_nsec;
 
-	unsigned int	target_st_mtime;
-	unsigned int	target_st_mtime_nsec;
+	abi_uint	target_st_mtime;
+	abi_uint	target_st_mtime_nsec;
 
-	unsigned int	target_st_ctime;
-	unsigned int	target_st_ctime_nsec;
+	abi_uint	target_st_ctime;
+	abi_uint	target_st_ctime_nsec;
 
-	unsigned int	__unused1;
-	unsigned int	__unused2;
+	abi_uint	__unused1;
+	abi_uint	__unused2;
 };
 
 #elif defined(TARGET_PPC)