Changeset View
Changeset View
Standalone View
Standalone View
head/lang/rust/files/extra-patch-ino64
| --- ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2017-04-24 18:56:45.000000000 +0000 | |||||
| +++ ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs 2017-05-30 07:55:40.703709000 +0000 | |||||
| @@ -7,10 +7,12 @@ | |||||
| pub struct stat { | |||||
| pub st_dev: ::dev_t, | |||||
| pub st_ino: ::ino_t, | |||||
| - pub st_mode: ::mode_t, | |||||
| pub st_nlink: ::nlink_t, | |||||
| + pub st_mode: ::mode_t, | |||||
| + pub st_pad0: ::uint16_t, | |||||
| pub st_uid: ::uid_t, | |||||
| pub st_gid: ::gid_t, | |||||
| + pub st_pad1: ::uint32_t, | |||||
| pub st_rdev: ::dev_t, | |||||
| pub st_atime: ::time_t, | |||||
| pub st_atime_nsec: ::c_long, | |||||
| @@ -18,13 +20,13 @@ | |||||
| pub st_mtime_nsec: ::c_long, | |||||
| pub st_ctime: ::time_t, | |||||
| pub st_ctime_nsec: ::c_long, | |||||
| + pub st_birthtime: ::time_t, | |||||
| + pub st_birthtime_nsec: ::c_long, | |||||
| pub st_size: ::off_t, | |||||
| pub st_blocks: ::blkcnt_t, | |||||
| pub st_blksize: ::blksize_t, | |||||
| pub st_flags: ::fflags_t, | |||||
| - pub st_gen: ::uint32_t, | |||||
| - pub st_lspare: ::int32_t, | |||||
| - pub st_birthtime: ::time_t, | |||||
| - pub st_birthtime_nsec: ::c_long, | |||||
| + pub st_gen: ::uint64_t, | |||||
| + pub st_spare: [::int64_t; 10], | |||||
| } | |||||
| } | |||||
| --- ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2017-04-24 18:56:45.000000000 +0000 | --- ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2017-04-24 18:56:45.000000000 +0000 | ||||
| +++ ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs 2017-05-25 16:28:37.280076000 +0000 | +++ ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs 2017-05-25 16:28:37.280076000 +0000 | ||||
| @@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | ||||
| pub type fflags_t = u32; | pub type fflags_t = u32; | ||||
| pub type clock_t = i32; | pub type clock_t = i32; | ||||
| -pub type ino_t = u32; | -pub type ino_t = u32; | ||||
| +pub type ino_t = u64; | +pub type ino_t = u64; | ||||
| pub type lwpid_t = i32; | pub type lwpid_t = i32; | ||||
| ▲ Show 20 Lines • Show All 191 Lines • ▼ Show 20 Lines | @@ -146,9 +144,6 @@ | ||||
| fn st_flags(&self) -> u32 { | fn st_flags(&self) -> u32 { | ||||
| self.as_inner().as_inner().st_flags as u32 | self.as_inner().as_inner().st_flags as u32 | ||||
| - } | - } | ||||
| - fn st_lspare(&self) -> u32 { | - fn st_lspare(&self) -> u32 { | ||||
| - self.as_inner().as_inner().st_lspare as u32 | - self.as_inner().as_inner().st_lspare as u32 | ||||
| } | } | ||||
| } | } | ||||
| --- ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2017-04-24 20:20:26.000000000 +0000 | |||||
| +++ ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs 2017-05-30 07:57:19.874957000 +0000 | |||||
| @@ -7,10 +7,12 @@ | |||||
| pub struct stat { | |||||
| pub st_dev: ::dev_t, | |||||
| pub st_ino: ::ino_t, | |||||
| - pub st_mode: ::mode_t, | |||||
| pub st_nlink: ::nlink_t, | |||||
| + pub st_mode: ::mode_t, | |||||
| + pub st_pad0: ::uint16_t, | |||||
jbeich: Don't you need `s/::uint16_t/u16/` etc. under `src/vendor/libc/` for consistency with `x86*.rs`? | |||||
| pub st_uid: ::uid_t, | |||||
| pub st_gid: ::gid_t, | |||||
| + pub st_pad1: ::uint32_t, | |||||
| pub st_rdev: ::dev_t, | |||||
| pub st_atime: ::time_t, | |||||
| pub st_atime_nsec: ::c_long, | |||||
| @@ -18,13 +20,13 @@ | |||||
| pub st_mtime_nsec: ::c_long, | |||||
| pub st_ctime: ::time_t, | |||||
| pub st_ctime_nsec: ::c_long, | |||||
| + pub st_birthtime: ::time_t, | |||||
| + pub st_birthtime_nsec: ::c_long, | |||||
| pub st_size: ::off_t, | |||||
| pub st_blocks: ::blkcnt_t, | |||||
| pub st_blksize: ::blksize_t, | |||||
| pub st_flags: ::fflags_t, | |||||
| - pub st_gen: ::uint32_t, | |||||
| - pub st_lspare: ::int32_t, | |||||
| - pub st_birthtime: ::time_t, | |||||
| - pub st_birthtime_nsec: ::c_long, | |||||
| + pub st_gen: ::uint64_t, | |||||
| + pub st_spare: [::int64_t; 10], | |||||
| } | |||||
| } | |||||
| --- ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2017-04-24 20:20:26.000000000 +0000 | --- ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2017-04-24 20:20:26.000000000 +0000 | ||||
| +++ ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs 2017-05-25 16:25:42.305261000 +0000 | +++ ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs 2017-05-25 16:25:42.305261000 +0000 | ||||
| @@ -7,10 +7,12 @@ | @@ -7,10 +7,12 @@ | ||||
| pub struct stat { | pub struct stat { | ||||
| pub st_dev: ::dev_t, | pub st_dev: ::dev_t, | ||||
| pub st_ino: ::ino_t, | pub st_ino: ::ino_t, | ||||
| - pub st_mode: ::mode_t, | - pub st_mode: ::mode_t, | ||||
| pub st_nlink: ::nlink_t, | pub st_nlink: ::nlink_t, | ||||
| ▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines | |||||
Don't you need s/::uint16_t/u16/ etc. under src/vendor/libc/ for consistency with x86*.rs?