gwj / at91sam9263 · Commits

Commit 325e651fb78cc970e170aa502bae6e3fa2c26db7

Authored by j_mayer
1 parent fca743f3

Fix PowerPC 64 stat and statfs structures definitions. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3712 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 36 additions and 0 deletions
linux-user/syscall_defs.h
  View file @325e651
@@ -1088,8 +1088,13 @@ struct target_stat64 { @@ -1088,8 +1088,13 @@ struct target_stat64 {
1088 struct target_stat { 1088 struct target_stat {
1089 unsigned short st_dev; 1089 unsigned short st_dev;
1090 abi_ulong st_ino; 1090 abi_ulong st_ino;
  1091 +#if defined(TARGET_PPC64) && !defined(TARGET_ABI32)
  1092 + unsigned short st_nlink;
  1093 + unsigned int st_mode;
  1094 +#else
1091 unsigned int st_mode; 1095 unsigned int st_mode;
1092 unsigned short st_nlink; 1096 unsigned short st_nlink;
  1097 +#endif
1093 unsigned int st_uid; 1098 unsigned int st_uid;
1094 unsigned int st_gid; 1099 unsigned int st_gid;
1095 unsigned short st_rdev; 1100 unsigned short st_rdev;
@@ -1104,6 +1109,9 @@ struct target_stat { @@ -1104,6 +1109,9 @@ struct target_stat {
1104 abi_ulong __unused3; 1109 abi_ulong __unused3;
1105 abi_ulong __unused4; 1110 abi_ulong __unused4;
1106 abi_ulong __unused5; 1111 abi_ulong __unused5;
  1112 +#if defined(TARGET_PPC64) && !defined(TARGET_ABI32)
  1113 + abi_ulong __unused6;
  1114 +#endif
1107 }; 1115 };
1108 1116
1109 struct target_stat64 { 1117 struct target_stat64 {
@@ -1555,6 +1563,34 @@ struct target_statfs64 { @@ -1555,6 +1563,34 @@ struct target_statfs64 {
1555 uint32_t f_namelen; 1563 uint32_t f_namelen;
1556 uint32_t f_spare[6]; 1564 uint32_t f_spare[6];
1557 }; 1565 };
  1566 +#elif defined(TARGET_PPC64) && !defined(TARGET_ABI32)
  1567 +struct target_statfs {
  1568 + abi_long f_type;
  1569 + abi_long f_bsize;
  1570 + abi_long f_blocks;
  1571 + abi_long f_bfree;
  1572 + abi_long f_bavail;
  1573 + abi_long f_files;
  1574 + abi_long f_ffree;
  1575 + target_fsid_t f_fsid;
  1576 + abi_long f_namelen;
  1577 + abi_long f_frsize;
  1578 + abi_long f_spare[5];
  1579 +};
  1580 +
  1581 +struct target_statfs64 {
  1582 + abi_long f_type;
  1583 + abi_long f_bsize;
  1584 + abi_long f_blocks;
  1585 + abi_long f_bfree;
  1586 + abi_long f_bavail;
  1587 + abi_long f_files;
  1588 + abi_long f_ffree;
  1589 + target_fsid_t f_fsid;
  1590 + abi_long f_namelen;
  1591 + abi_long f_frsize;
  1592 + abi_long f_spare[5];
  1593 +};
1558 #else 1594 #else
1559 struct target_statfs { 1595 struct target_statfs {
1560 uint32_t f_type; 1596 uint32_t f_type;