From 10f960328a04fcc6e42d8c52bb3fdc69b1954490 Mon Sep 17 00:00:00 2001 From: Denis Drakhnya Date: Mon, 4 Jan 2021 23:37:42 +0200 Subject: [PATCH] e2k: Update target_stat and target_statfs structs. --- linux-user/syscall_defs.h | 103 +++++++++++++++++++++++--------------- 1 file changed, 63 insertions(+), 40 deletions(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 7402c41578..8ed776cdc7 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1555,50 +1555,43 @@ struct target_stat64 { #elif defined(TARGET_E2K) #define TARGET_STAT_HAVE_NSEC struct target_stat { - unsigned long st_dev; - unsigned long st_ino; - unsigned int st_mode; - unsigned int st_nlink; - unsigned int st_uid; - unsigned int st_gid; - unsigned long st_rdev; - unsigned long __pad1; - long st_size; - int st_blksize; - int __pad2; - long st_blocks; - int target_st_atime; - unsigned int target_st_atime_nsec; - int target_st_mtime; - unsigned int target_st_mtime_nsec; - int target_st_ctime; - unsigned int target_st_ctime_nsec; - unsigned int __unused4; - unsigned int __unused5; + abi_uint st_dev; + abi_ulong st_ino; + abi_uint st_mode; + abi_uint st_nlink; + abi_uint st_uid; + abi_uint st_gid; + abi_uint st_rdev; + abi_long st_size; + abi_long st_blksize; + abi_long st_blocks; + abi_long target_st_atime; + abi_ulong target_st_atime_nsec; + abi_long target_st_mtime; + abi_ulong target_st_mtime_nsec; + abi_long target_st_ctime; + abi_ulong target_st_ctime_nsec; }; #define TARGET_HAS_STRUCT_STAT64 struct target_stat64 { - unsigned long long st_dev; - unsigned long long st_ino; - unsigned int st_mode; - unsigned int st_nlink; - unsigned int st_uid; - unsigned int st_gid; - unsigned long long st_rdev; - unsigned long long __pad0; - long long st_size; - int st_blksize; - int __pad1; - long long st_blocks; - int target_st_atime; - unsigned int target_st_atime_nsec; - int target_st_mtime; - unsigned int target_st_mtime_nsec; - int target_st_ctime; - unsigned int target_st_ctime_nsec; - unsigned int __unused4; - unsigned int __unused5; + abi_ulong st_dev; + abi_ulong st_ino; + abi_uint st_mode; + abi_uint st_nlink; + abi_uint st_uid; + abi_uint st_gid; + abi_ulong st_rdev; + abi_ulong st_size; + abi_uint st_blksize; + abi_uint __unused1; + abi_ulong st_blocks; + abi_int target_st_atime; + abi_uint target_st_atime_nsec; + abi_int target_st_mtime; + abi_uint target_st_mtime_nsec; + abi_int target_st_ctime; + abi_uint target_st_ctime_nsec; }; #elif defined(TARGET_PPC) @@ -2368,6 +2361,36 @@ struct target_statfs64 { int32_t f_flags; int32_t f_spare[4]; }; +#elif defined(TARGET_E2K) +struct target_statfs { + abi_long f_type; + abi_long f_bsize; + abi_ulong f_blocks; + abi_ulong f_bfree; + abi_ulong f_bavail; + abi_ulong f_files; + abi_ulong f_ffree; + target_fsid_t f_fsid; + abi_long f_namelen; + abi_long f_frsize; + abi_long f_flags; + abi_long f_spare[4]; +}; + +struct target_statfs64 { + abi_long f_type; + abi_long f_bsize; + abi_ullong f_blocks; + abi_ullong f_bfree; + abi_ullong f_bavail; + abi_ullong f_files; + abi_ullong f_ffree; + target_fsid_t f_fsid; + abi_long f_namelen; + abi_long f_frsize; + abi_long f_flags; + abi_long f_spare[4]; +}; #else struct target_statfs { uint32_t f_type;