unix: don't export padding fields on all platforms

Fixes golang/go#18632.

Change-Id: I9d07937dc93f860b09a99a86fe517b85f4dcd1b2
Reviewed-on: https://go-review.googlesource.com/89495
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

unix/mkpost.go

@@ -65,12 +65,12 @@ func main() {
 	spareFieldsRegex := regexp.MustCompile(`X__spare\S*`)
 	b = spareFieldsRegex.ReplaceAll(b, []byte("_"))
 
+	// Remove cgo padding fields
+	removePaddingFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`)
+	b = removePaddingFieldsRegex.ReplaceAll(b, []byte("_"))
+
 	// We refuse to export private fields on s390x
 	if goarch == "s390x" && goos == "linux" {
-		// Remove cgo padding fields
-		removeFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`)
-		b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
-
 		// Remove padding, hidden, or unused fields
 		removeFieldsRegex = regexp.MustCompile(`\bX_\S+`)
 		b = removeFieldsRegex.ReplaceAll(b, []byte("_"))

unix/ztypes_linux_386.go

@@ -52,7 +52,7 @@ type Timex struct {
 	Errcnt    int32
 	Stbcnt    int32
 	Tai       int32
-	Pad_cgo_0 [44]byte
+	_         [44]byte
 }
 
 type Time_t int32
@@ -98,7 +98,7 @@ type _Gid_t uint32
 type Stat_t struct {
 	Dev       uint64
 	X__pad1   uint16
-	Pad_cgo_0 [2]byte
+	_         [2]byte
 	X__st_ino uint32
 	Mode      uint32
 	Nlink     uint32
@@ -106,7 +106,7 @@ type Stat_t struct {
 	Gid       uint32
 	Rdev      uint64
 	X__pad2   uint16
-	Pad_cgo_1 [2]byte
+	_         [2]byte
 	Size      int64
 	Blksize   int32
 	Blocks    int64
@@ -167,7 +167,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]int8
-	Pad_cgo_0 [1]byte
+	_      [1]byte
 }
 
 type Fsid struct {
@@ -256,7 +256,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -371,7 +371,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -596,7 +596,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [2]byte
+	_      [2]byte
 	Filter *SockFilter
 }
 
@@ -730,11 +730,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -746,13 +746,13 @@ type Taskstats struct {
 	Ac_comm                   [32]int8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64

unix/ztypes_linux_amd64.go

@@ -33,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -48,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -167,7 +167,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]int8
-	Pad_cgo_0 [5]byte
+	_      [5]byte
 }
 
 type Fsid struct {
@@ -177,11 +177,11 @@ type Fsid struct {
 type Flock_t struct {
 	Type   int16
 	Whence int16
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Start  int64
 	Len    int64
 	Pid    int32
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type FscryptPolicy struct {
@@ -258,7 +258,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -327,13 +327,13 @@ type PacketMreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
@@ -375,7 +375,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -600,7 +600,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [6]byte
+	_      [6]byte
 	Filter *SockFilter
 }
 
@@ -658,12 +658,12 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
 	X_f       [0]int8
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 }
 
 type Utsname struct {
@@ -677,11 +677,11 @@ type Utsname struct {
 
 type Ustat_t struct {
 	Tfree  int32
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Tinode uint64
 	Fname  [6]int8
 	Fpack  [6]int8
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -748,11 +748,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -764,13 +764,13 @@ type Taskstats struct {
 	Ac_comm                   [32]int8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64

unix/ztypes_linux_arm.go

@@ -52,7 +52,7 @@ type Timex struct {
 	Errcnt    int32
 	Stbcnt    int32
 	Tai       int32
-	Pad_cgo_0 [44]byte
+	_         [44]byte
 }
 
 type Time_t int32
@@ -98,7 +98,7 @@ type _Gid_t uint32
 type Stat_t struct {
 	Dev       uint64
 	X__pad1   uint16
-	Pad_cgo_0 [2]byte
+	_         [2]byte
 	X__st_ino uint32
 	Mode      uint32
 	Nlink     uint32
@@ -106,10 +106,10 @@ type Stat_t struct {
 	Gid       uint32
 	Rdev      uint64
 	X__pad2   uint16
-	Pad_cgo_1 [6]byte
+	_         [6]byte
 	Size      int64
 	Blksize   int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Blocks    int64
 	Atim      Timespec
 	Mtim      Timespec
@@ -130,7 +130,7 @@ type Statfs_t struct {
 	Frsize  int32
 	Flags   int32
 	Spare   [4]int32
-	Pad_cgo_0 [4]byte
+	_       [4]byte
 }
 
 type StatxTimestamp struct {
@@ -169,7 +169,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]uint8
-	Pad_cgo_0 [5]byte
+	_      [5]byte
 }
 
 type Fsid struct {
@@ -179,11 +179,11 @@ type Fsid struct {
 type Flock_t struct {
 	Type   int16
 	Whence int16
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Start  int64
 	Len    int64
 	Pid    int32
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type FscryptPolicy struct {
@@ -260,7 +260,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -375,7 +375,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -600,7 +600,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [2]byte
+	_      [2]byte
 	Filter *SockFilter
 }
 
@@ -719,11 +719,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -735,13 +735,13 @@ type Taskstats struct {
 	Ac_comm                   [32]uint8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64

unix/ztypes_linux_arm64.go

@@ -33,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -48,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -168,7 +168,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]int8
-	Pad_cgo_0 [5]byte
+	_      [5]byte
 }
 
 type Fsid struct {
@@ -178,11 +178,11 @@ type Fsid struct {
 type Flock_t struct {
 	Type   int16
 	Whence int16
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Start  int64
 	Len    int64
 	Pid    int32
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type FscryptPolicy struct {
@@ -259,7 +259,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -328,13 +328,13 @@ type PacketMreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
@@ -376,7 +376,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -601,7 +601,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [6]byte
+	_      [6]byte
 	Filter *SockFilter
 }
 
@@ -636,12 +636,12 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
 	X_f       [0]int8
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 }
 
 type Utsname struct {
@@ -655,11 +655,11 @@ type Utsname struct {
 
 type Ustat_t struct {
 	Tfree  int32
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Tinode uint64
 	Fname  [6]int8
 	Fpack  [6]int8
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -727,11 +727,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -743,13 +743,13 @@ type Taskstats struct {
 	Ac_comm                   [32]int8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64

unix/ztypes_linux_mips.go

@@ -52,7 +52,7 @@ type Timex struct {
 	Errcnt    int32
 	Stbcnt    int32
 	Tai       int32
-	Pad_cgo_0 [44]byte
+	_         [44]byte
 }
 
 type Time_t int32
@@ -119,7 +119,7 @@ type Statfs_t struct {
 	Type    int32
 	Bsize   int32
 	Frsize  int32
-	Pad_cgo_0 [4]byte
+	_       [4]byte
 	Blocks  uint64
 	Bfree   uint64
 	Files   uint64
@@ -129,7 +129,7 @@ type Statfs_t struct {
 	Namelen int32
 	Flags   int32
 	Spare   [5]int32
-	Pad_cgo_1 [4]byte
+	_       [4]byte
 }
 
 type StatxTimestamp struct {
@@ -168,7 +168,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]int8
-	Pad_cgo_0 [5]byte
+	_      [5]byte
 }
 
 type Fsid struct {
@@ -178,11 +178,11 @@ type Fsid struct {
 type Flock_t struct {
 	Type   int16
 	Whence int16
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Start  int64
 	Len    int64
 	Pid    int32
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type FscryptPolicy struct {
@@ -259,7 +259,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -374,7 +374,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -599,7 +599,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [2]byte
+	_      [2]byte
 	Filter *SockFilter
 }
 
@@ -724,11 +724,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -740,13 +740,13 @@ type Taskstats struct {
 	Ac_comm                   [32]int8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64

unix/ztypes_linux_mips64.go

@@ -33,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -48,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -168,7 +168,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]int8
-	Pad_cgo_0 [5]byte
+	_      [5]byte
 }
 
 type Fsid struct {
@@ -178,11 +178,11 @@ type Fsid struct {
 type Flock_t struct {
 	Type   int16
 	Whence int16
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Start  int64
 	Len    int64
 	Pid    int32
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type FscryptPolicy struct {
@@ -259,7 +259,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -328,13 +328,13 @@ type PacketMreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
@@ -376,7 +376,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -601,7 +601,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [6]byte
+	_      [6]byte
 	Filter *SockFilter
 }
 
@@ -639,12 +639,12 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
 	X_f       [0]int8
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 }
 
 type Utsname struct {
@@ -658,11 +658,11 @@ type Utsname struct {
 
 type Ustat_t struct {
 	Tfree  int32
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Tinode uint64
 	Fname  [6]int8
 	Fpack  [6]int8
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -729,11 +729,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -745,13 +745,13 @@ type Taskstats struct {
 	Ac_comm                   [32]int8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64

unix/ztypes_linux_mips64le.go

@@ -33,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -48,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -168,7 +168,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]int8
-	Pad_cgo_0 [5]byte
+	_      [5]byte
 }
 
 type Fsid struct {
@@ -178,11 +178,11 @@ type Fsid struct {
 type Flock_t struct {
 	Type   int16
 	Whence int16
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Start  int64
 	Len    int64
 	Pid    int32
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type FscryptPolicy struct {
@@ -259,7 +259,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -328,13 +328,13 @@ type PacketMreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
@@ -376,7 +376,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -601,7 +601,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [6]byte
+	_      [6]byte
 	Filter *SockFilter
 }
 
@@ -639,12 +639,12 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
 	X_f       [0]int8
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 }
 
 type Utsname struct {
@@ -658,11 +658,11 @@ type Utsname struct {
 
 type Ustat_t struct {
 	Tfree  int32
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Tinode uint64
 	Fname  [6]int8
 	Fpack  [6]int8
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -729,11 +729,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -745,13 +745,13 @@ type Taskstats struct {
 	Ac_comm                   [32]int8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64

unix/ztypes_linux_mipsle.go

@@ -52,7 +52,7 @@ type Timex struct {
 	Errcnt    int32
 	Stbcnt    int32
 	Tai       int32
-	Pad_cgo_0 [44]byte
+	_         [44]byte
 }
 
 type Time_t int32
@@ -119,7 +119,7 @@ type Statfs_t struct {
 	Type    int32
 	Bsize   int32
 	Frsize  int32
-	Pad_cgo_0 [4]byte
+	_       [4]byte
 	Blocks  uint64
 	Bfree   uint64
 	Files   uint64
@@ -129,7 +129,7 @@ type Statfs_t struct {
 	Namelen int32
 	Flags   int32
 	Spare   [5]int32
-	Pad_cgo_1 [4]byte
+	_       [4]byte
 }
 
 type StatxTimestamp struct {
@@ -168,7 +168,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]int8
-	Pad_cgo_0 [5]byte
+	_      [5]byte
 }
 
 type Fsid struct {
@@ -178,11 +178,11 @@ type Fsid struct {
 type Flock_t struct {
 	Type   int16
 	Whence int16
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Start  int64
 	Len    int64
 	Pid    int32
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type FscryptPolicy struct {
@@ -259,7 +259,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -374,7 +374,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -599,7 +599,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [2]byte
+	_      [2]byte
 	Filter *SockFilter
 }
 
@@ -724,11 +724,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -740,13 +740,13 @@ type Taskstats struct {
 	Ac_comm                   [32]int8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64

unix/ztypes_linux_ppc64.go

@@ -33,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -48,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -169,7 +169,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]uint8
-	Pad_cgo_0 [5]byte
+	_      [5]byte
 }
 
 type Fsid struct {
@@ -179,11 +179,11 @@ type Fsid struct {
 type Flock_t struct {
 	Type   int16
 	Whence int16
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Start  int64
 	Len    int64
 	Pid    int32
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type FscryptPolicy struct {
@@ -260,7 +260,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -329,13 +329,13 @@ type PacketMreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
@@ -377,7 +377,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -602,7 +602,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [6]byte
+	_      [6]byte
 	Filter *SockFilter
 }
 
@@ -646,12 +646,12 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
 	X_f       [0]uint8
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 }
 
 type Utsname struct {
@@ -665,11 +665,11 @@ type Utsname struct {
 
 type Ustat_t struct {
 	Tfree  int32
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Tinode uint64
 	Fname  [6]uint8
 	Fpack  [6]uint8
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -737,11 +737,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -753,13 +753,13 @@ type Taskstats struct {
 	Ac_comm                   [32]uint8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64

unix/ztypes_linux_ppc64le.go

@@ -33,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -48,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -169,7 +169,7 @@ type Dirent struct {
 	Reclen uint16
 	Type   uint8
 	Name   [256]uint8
-	Pad_cgo_0 [5]byte
+	_      [5]byte
 }
 
 type Fsid struct {
@@ -179,11 +179,11 @@ type Fsid struct {
 type Flock_t struct {
 	Type   int16
 	Whence int16
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Start  int64
 	Len    int64
 	Pid    int32
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type FscryptPolicy struct {
@@ -260,7 +260,7 @@ type RawSockaddrHCI struct {
 
 type RawSockaddrCAN struct {
 	Family  uint16
-	Pad_cgo_0 [2]byte
+	_       [2]byte
 	Ifindex int32
 	Addr    [8]byte
 }
@@ -329,13 +329,13 @@ type PacketMreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
@@ -377,7 +377,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -602,7 +602,7 @@ type SockFilter struct {
 
 type SockFprog struct {
 	Len    uint16
-	Pad_cgo_0 [6]byte
+	_      [6]byte
 	Filter *SockFilter
 }
 
@@ -646,12 +646,12 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
 	X_f       [0]uint8
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 }
 
 type Utsname struct {
@@ -665,11 +665,11 @@ type Utsname struct {
 
 type Ustat_t struct {
 	Tfree  int32
-	Pad_cgo_0 [4]byte
+	_      [4]byte
 	Tinode uint64
 	Fname  [6]uint8
 	Fpack  [6]uint8
-	Pad_cgo_1 [4]byte
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -737,11 +737,11 @@ type Winsize struct {
 
 type Taskstats struct {
 	Version                   uint16
-	Pad_cgo_0                 [2]byte
+	_                         [2]byte
 	Ac_exitcode               uint32
 	Ac_flag                   uint8
 	Ac_nice                   uint8
-	Pad_cgo_1                 [6]byte
+	_                         [6]byte
 	Cpu_count                 uint64
 	Cpu_delay_total           uint64
 	Blkio_count               uint64
@@ -753,13 +753,13 @@ type Taskstats struct {
 	Ac_comm                   [32]uint8
 	Ac_sched                  uint8
 	Ac_pad                    [3]uint8
-	Pad_cgo_2                 [4]byte
+	_                         [4]byte
 	Ac_uid                    uint32
 	Ac_gid                    uint32
 	Ac_pid                    uint32
 	Ac_ppid                   uint32
 	Ac_btime                  uint32
-	Pad_cgo_3                 [4]byte
+	_                         [4]byte
 	Ac_etime                  uint64
 	Ac_utime                  uint64
 	Ac_stime                  uint64