From 480373c7560cd64e4b6c624d84e9d0de6d72c076 Mon Sep 17 00:00:00 2001 From: Yuval Pavel Zholkover Date: Sat, 29 Dec 2018 14:27:15 +0200 Subject: syscall: revert to pre-FreeBSD 10 / POSIX-2008 timespec field names in Stat_t on FreeBSD CL 138595 introduced the new names when the hardcoded stat8 definitions was replaced with a cgo generated one. Fixes #29393 Updates #22448 Change-Id: I6309958306329ff301c17344b2e0ead0cc874224 Reviewed-on: https://go-review.googlesource.com/c/155958 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- api/except.txt | 24 ------------------------ api/go1.12.txt | 24 ------------------------ 2 files changed, 48 deletions(-) (limited to 'api') diff --git a/api/except.txt b/api/except.txt index a911783c6b..637be18135 100644 --- a/api/except.txt +++ b/api/except.txt @@ -386,15 +386,11 @@ pkg syscall (windows-amd64), type RawSockaddrAny struct, Pad [96]int8 pkg syscall (freebsd-386), func Mknod(string, uint32, int) error pkg syscall (freebsd-386), type Dirent struct, Fileno uint32 pkg syscall (freebsd-386), type Dirent struct, Namlen uint8 -pkg syscall (freebsd-386), type Stat_t struct, Atimespec Timespec -pkg syscall (freebsd-386), type Stat_t struct, Birthtimespec Timespec pkg syscall (freebsd-386), type Stat_t struct, Blksize uint32 -pkg syscall (freebsd-386), type Stat_t struct, Ctimespec Timespec pkg syscall (freebsd-386), type Stat_t struct, Dev uint32 pkg syscall (freebsd-386), type Stat_t struct, Gen uint32 pkg syscall (freebsd-386), type Stat_t struct, Ino uint32 pkg syscall (freebsd-386), type Stat_t struct, Lspare int32 -pkg syscall (freebsd-386), type Stat_t struct, Mtimespec Timespec pkg syscall (freebsd-386), type Stat_t struct, Nlink uint16 pkg syscall (freebsd-386), type Stat_t struct, Pad_cgo_0 [8]uint8 pkg syscall (freebsd-386), type Stat_t struct, Rdev uint32 @@ -403,15 +399,11 @@ pkg syscall (freebsd-386), type Statfs_t struct, Mntonname [88]int8 pkg syscall (freebsd-386-cgo), func Mknod(string, uint32, int) error pkg syscall (freebsd-386-cgo), type Dirent struct, Fileno uint32 pkg syscall (freebsd-386-cgo), type Dirent struct, Namlen uint8 -pkg syscall (freebsd-386-cgo), type Stat_t struct, Atimespec Timespec -pkg syscall (freebsd-386-cgo), type Stat_t struct, Birthtimespec Timespec pkg syscall (freebsd-386-cgo), type Stat_t struct, Blksize uint32 -pkg syscall (freebsd-386-cgo), type Stat_t struct, Ctimespec Timespec pkg syscall (freebsd-386-cgo), type Stat_t struct, Dev uint32 pkg syscall (freebsd-386-cgo), type Stat_t struct, Gen uint32 pkg syscall (freebsd-386-cgo), type Stat_t struct, Ino uint32 pkg syscall (freebsd-386-cgo), type Stat_t struct, Lspare int32 -pkg syscall (freebsd-386-cgo), type Stat_t struct, Mtimespec Timespec pkg syscall (freebsd-386-cgo), type Stat_t struct, Nlink uint16 pkg syscall (freebsd-386-cgo), type Stat_t struct, Pad_cgo_0 [8]uint8 pkg syscall (freebsd-386-cgo), type Stat_t struct, Rdev uint32 @@ -420,15 +412,11 @@ pkg syscall (freebsd-386-cgo), type Statfs_t struct, Mntonname [88]int8 pkg syscall (freebsd-amd64), func Mknod(string, uint32, int) error pkg syscall (freebsd-amd64), type Dirent struct, Fileno uint32 pkg syscall (freebsd-amd64), type Dirent struct, Namlen uint8 -pkg syscall (freebsd-amd64), type Stat_t struct, Atimespec Timespec -pkg syscall (freebsd-amd64), type Stat_t struct, Birthtimespec Timespec pkg syscall (freebsd-amd64), type Stat_t struct, Blksize uint32 -pkg syscall (freebsd-amd64), type Stat_t struct, Ctimespec Timespec pkg syscall (freebsd-amd64), type Stat_t struct, Dev uint32 pkg syscall (freebsd-amd64), type Stat_t struct, Gen uint32 pkg syscall (freebsd-amd64), type Stat_t struct, Ino uint32 pkg syscall (freebsd-amd64), type Stat_t struct, Lspare int32 -pkg syscall (freebsd-amd64), type Stat_t struct, Mtimespec Timespec pkg syscall (freebsd-amd64), type Stat_t struct, Nlink uint16 pkg syscall (freebsd-amd64), type Stat_t struct, Rdev uint32 pkg syscall (freebsd-amd64), type Statfs_t struct, Mntfromname [88]int8 @@ -436,15 +424,11 @@ pkg syscall (freebsd-amd64), type Statfs_t struct, Mntonname [88]int8 pkg syscall (freebsd-amd64-cgo), func Mknod(string, uint32, int) error pkg syscall (freebsd-amd64-cgo), type Dirent struct, Fileno uint32 pkg syscall (freebsd-amd64-cgo), type Dirent struct, Namlen uint8 -pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Atimespec Timespec -pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Birthtimespec Timespec pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Blksize uint32 -pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Ctimespec Timespec pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Dev uint32 pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Gen uint32 pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Ino uint32 pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Lspare int32 -pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Mtimespec Timespec pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Nlink uint16 pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Rdev uint32 pkg syscall (freebsd-amd64-cgo), type Statfs_t struct, Mntfromname [88]int8 @@ -452,15 +436,11 @@ pkg syscall (freebsd-amd64-cgo), type Statfs_t struct, Mntonname [88]int8 pkg syscall (freebsd-arm), func Mknod(string, uint32, int) error pkg syscall (freebsd-arm), type Dirent struct, Fileno uint32 pkg syscall (freebsd-arm), type Dirent struct, Namlen uint8 -pkg syscall (freebsd-arm), type Stat_t struct, Atimespec Timespec -pkg syscall (freebsd-arm), type Stat_t struct, Birthtimespec Timespec pkg syscall (freebsd-arm), type Stat_t struct, Blksize uint32 -pkg syscall (freebsd-arm), type Stat_t struct, Ctimespec Timespec pkg syscall (freebsd-arm), type Stat_t struct, Dev uint32 pkg syscall (freebsd-arm), type Stat_t struct, Gen uint32 pkg syscall (freebsd-arm), type Stat_t struct, Ino uint32 pkg syscall (freebsd-arm), type Stat_t struct, Lspare int32 -pkg syscall (freebsd-arm), type Stat_t struct, Mtimespec Timespec pkg syscall (freebsd-arm), type Stat_t struct, Nlink uint16 pkg syscall (freebsd-arm), type Stat_t struct, Rdev uint32 pkg syscall (freebsd-arm), type Statfs_t struct, Mntfromname [88]int8 @@ -468,15 +448,11 @@ pkg syscall (freebsd-arm), type Statfs_t struct, Mntonname [88]int8 pkg syscall (freebsd-arm-cgo), func Mknod(string, uint32, int) error pkg syscall (freebsd-arm-cgo), type Dirent struct, Fileno uint32 pkg syscall (freebsd-arm-cgo), type Dirent struct, Namlen uint8 -pkg syscall (freebsd-arm-cgo), type Stat_t struct, Atimespec Timespec -pkg syscall (freebsd-arm-cgo), type Stat_t struct, Birthtimespec Timespec pkg syscall (freebsd-arm-cgo), type Stat_t struct, Blksize uint32 -pkg syscall (freebsd-arm-cgo), type Stat_t struct, Ctimespec Timespec pkg syscall (freebsd-arm-cgo), type Stat_t struct, Dev uint32 pkg syscall (freebsd-arm-cgo), type Stat_t struct, Gen uint32 pkg syscall (freebsd-arm-cgo), type Stat_t struct, Ino uint32 pkg syscall (freebsd-arm-cgo), type Stat_t struct, Lspare int32 -pkg syscall (freebsd-arm-cgo), type Stat_t struct, Mtimespec Timespec pkg syscall (freebsd-arm-cgo), type Stat_t struct, Nlink uint16 pkg syscall (freebsd-arm-cgo), type Stat_t struct, Rdev uint32 pkg syscall (freebsd-arm-cgo), type Statfs_t struct, Mntfromname [88]int8 diff --git a/api/go1.12.txt b/api/go1.12.txt index 865f04b76b..319bb6f145 100644 --- a/api/go1.12.txt +++ b/api/go1.12.txt @@ -67,17 +67,13 @@ pkg syscall (freebsd-386), type Dirent struct, Namlen uint16 pkg syscall (freebsd-386), type Dirent struct, Off int64 pkg syscall (freebsd-386), type Dirent struct, Pad0 uint8 pkg syscall (freebsd-386), type Dirent struct, Pad1 uint16 -pkg syscall (freebsd-386), type Stat_t struct, Atim Timespec pkg syscall (freebsd-386), type Stat_t struct, Atim_ext int32 -pkg syscall (freebsd-386), type Stat_t struct, Birthtim Timespec pkg syscall (freebsd-386), type Stat_t struct, Blksize int32 pkg syscall (freebsd-386), type Stat_t struct, Btim_ext int32 -pkg syscall (freebsd-386), type Stat_t struct, Ctim Timespec pkg syscall (freebsd-386), type Stat_t struct, Ctim_ext int32 pkg syscall (freebsd-386), type Stat_t struct, Dev uint64 pkg syscall (freebsd-386), type Stat_t struct, Gen uint64 pkg syscall (freebsd-386), type Stat_t struct, Ino uint64 -pkg syscall (freebsd-386), type Stat_t struct, Mtim Timespec pkg syscall (freebsd-386), type Stat_t struct, Mtim_ext int32 pkg syscall (freebsd-386), type Stat_t struct, Nlink uint64 pkg syscall (freebsd-386), type Stat_t struct, Padding0 int16 @@ -97,17 +93,13 @@ pkg syscall (freebsd-386-cgo), type Dirent struct, Namlen uint16 pkg syscall (freebsd-386-cgo), type Dirent struct, Off int64 pkg syscall (freebsd-386-cgo), type Dirent struct, Pad0 uint8 pkg syscall (freebsd-386-cgo), type Dirent struct, Pad1 uint16 -pkg syscall (freebsd-386-cgo), type Stat_t struct, Atim Timespec pkg syscall (freebsd-386-cgo), type Stat_t struct, Atim_ext int32 -pkg syscall (freebsd-386-cgo), type Stat_t struct, Birthtim Timespec pkg syscall (freebsd-386-cgo), type Stat_t struct, Blksize int32 pkg syscall (freebsd-386-cgo), type Stat_t struct, Btim_ext int32 -pkg syscall (freebsd-386-cgo), type Stat_t struct, Ctim Timespec pkg syscall (freebsd-386-cgo), type Stat_t struct, Ctim_ext int32 pkg syscall (freebsd-386-cgo), type Stat_t struct, Dev uint64 pkg syscall (freebsd-386-cgo), type Stat_t struct, Gen uint64 pkg syscall (freebsd-386-cgo), type Stat_t struct, Ino uint64 -pkg syscall (freebsd-386-cgo), type Stat_t struct, Mtim Timespec pkg syscall (freebsd-386-cgo), type Stat_t struct, Mtim_ext int32 pkg syscall (freebsd-386-cgo), type Stat_t struct, Nlink uint64 pkg syscall (freebsd-386-cgo), type Stat_t struct, Padding0 int16 @@ -127,14 +119,10 @@ pkg syscall (freebsd-amd64), type Dirent struct, Namlen uint16 pkg syscall (freebsd-amd64), type Dirent struct, Off int64 pkg syscall (freebsd-amd64), type Dirent struct, Pad0 uint8 pkg syscall (freebsd-amd64), type Dirent struct, Pad1 uint16 -pkg syscall (freebsd-amd64), type Stat_t struct, Atim Timespec -pkg syscall (freebsd-amd64), type Stat_t struct, Birthtim Timespec pkg syscall (freebsd-amd64), type Stat_t struct, Blksize int32 -pkg syscall (freebsd-amd64), type Stat_t struct, Ctim Timespec pkg syscall (freebsd-amd64), type Stat_t struct, Dev uint64 pkg syscall (freebsd-amd64), type Stat_t struct, Gen uint64 pkg syscall (freebsd-amd64), type Stat_t struct, Ino uint64 -pkg syscall (freebsd-amd64), type Stat_t struct, Mtim Timespec pkg syscall (freebsd-amd64), type Stat_t struct, Nlink uint64 pkg syscall (freebsd-amd64), type Stat_t struct, Padding0 int16 pkg syscall (freebsd-amd64), type Stat_t struct, Padding1 int32 @@ -153,14 +141,10 @@ pkg syscall (freebsd-amd64-cgo), type Dirent struct, Namlen uint16 pkg syscall (freebsd-amd64-cgo), type Dirent struct, Off int64 pkg syscall (freebsd-amd64-cgo), type Dirent struct, Pad0 uint8 pkg syscall (freebsd-amd64-cgo), type Dirent struct, Pad1 uint16 -pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Atim Timespec -pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Birthtim Timespec pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Blksize int32 -pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Ctim Timespec pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Dev uint64 pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Gen uint64 pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Ino uint64 -pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Mtim Timespec pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Nlink uint64 pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Padding0 int16 pkg syscall (freebsd-amd64-cgo), type Stat_t struct, Padding1 int32 @@ -179,14 +163,10 @@ pkg syscall (freebsd-arm), type Dirent struct, Namlen uint16 pkg syscall (freebsd-arm), type Dirent struct, Off int64 pkg syscall (freebsd-arm), type Dirent struct, Pad0 uint8 pkg syscall (freebsd-arm), type Dirent struct, Pad1 uint16 -pkg syscall (freebsd-arm), type Stat_t struct, Atim Timespec -pkg syscall (freebsd-arm), type Stat_t struct, Birthtim Timespec pkg syscall (freebsd-arm), type Stat_t struct, Blksize int32 -pkg syscall (freebsd-arm), type Stat_t struct, Ctim Timespec pkg syscall (freebsd-arm), type Stat_t struct, Dev uint64 pkg syscall (freebsd-arm), type Stat_t struct, Gen uint64 pkg syscall (freebsd-arm), type Stat_t struct, Ino uint64 -pkg syscall (freebsd-arm), type Stat_t struct, Mtim Timespec pkg syscall (freebsd-arm), type Stat_t struct, Nlink uint64 pkg syscall (freebsd-arm), type Stat_t struct, Padding0 int16 pkg syscall (freebsd-arm), type Stat_t struct, Padding1 int32 @@ -205,14 +185,10 @@ pkg syscall (freebsd-arm-cgo), type Dirent struct, Namlen uint16 pkg syscall (freebsd-arm-cgo), type Dirent struct, Off int64 pkg syscall (freebsd-arm-cgo), type Dirent struct, Pad0 uint8 pkg syscall (freebsd-arm-cgo), type Dirent struct, Pad1 uint16 -pkg syscall (freebsd-arm-cgo), type Stat_t struct, Atim Timespec -pkg syscall (freebsd-arm-cgo), type Stat_t struct, Birthtim Timespec pkg syscall (freebsd-arm-cgo), type Stat_t struct, Blksize int32 -pkg syscall (freebsd-arm-cgo), type Stat_t struct, Ctim Timespec pkg syscall (freebsd-arm-cgo), type Stat_t struct, Dev uint64 pkg syscall (freebsd-arm-cgo), type Stat_t struct, Gen uint64 pkg syscall (freebsd-arm-cgo), type Stat_t struct, Ino uint64 -pkg syscall (freebsd-arm-cgo), type Stat_t struct, Mtim Timespec pkg syscall (freebsd-arm-cgo), type Stat_t struct, Nlink uint64 pkg syscall (freebsd-arm-cgo), type Stat_t struct, Padding0 int16 pkg syscall (freebsd-arm-cgo), type Stat_t struct, Padding1 int32 -- cgit v1.2.3-54-g00ecf