commit 52ab431487773bc9dd1b0766228b1cf3944126bf
author Tobias Klauser <tklauser@distanz.ch> Wed Nov 06 08:41:42 2019 +0100
committer Tobias Klauser <tobias.klauser@gmail.com> Fri Nov 15 15:19:21 2019 +0000
tree 0d8bd91b672aedacd5cb7ac7f1b1f93708120979
parent 4c7a9d0fe056d9d1de37e1409ca8a5c17accb46a

unix: fix EpollEvent padding on mips64{,le}

Like on other 64-bit GOARCHes, EpollEvent needs padding before Fd for
mips64 and mips64le.

Change-Id: I934368ba22ef7bf3a25949649613c2a03928bf83
Reviewed-on: https://go-review.googlesource.com/c/sys/+/207278
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

unix/linux/types.go

diff --git a/unix/linux/types.go b/unix/linux/types.go
index 4882ad4..4a6a224 100644
--- a/unix/linux/types.go
+++ b/unix/linux/types.go
@@ -283,7 +283,8 @@
 	// padding is not specified in linux/eventpoll.h but added to conform to the
 	// alignment requirements of EABI
 	int32_t padFd;
-#elif defined(__powerpc64__) || defined(__s390x__) || defined(__sparc__) || defined(__riscv)
+#elif defined(__powerpc64__) || defined(__s390x__) || defined(__sparc__) || defined(__riscv) \
+		|| (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI64)
 	int32_t _padFd;
 #endif
 	int32_t fd;

unix/ztypes_linux_mips64.go

diff --git a/unix/ztypes_linux_mips64.go b/unix/ztypes_linux_mips64.go
index 81a818b..c787be3 100644
--- a/unix/ztypes_linux_mips64.go
+++ b/unix/ztypes_linux_mips64.go
@@ -783,6 +783,7 @@
 
 type EpollEvent struct {
 	Events uint32
+	_      int32
 	Fd     int32
 	Pad    int32
 }

unix/ztypes_linux_mips64le.go

diff --git a/unix/ztypes_linux_mips64le.go b/unix/ztypes_linux_mips64le.go
index 214e345..5419123 100644
--- a/unix/ztypes_linux_mips64le.go
+++ b/unix/ztypes_linux_mips64le.go
@@ -783,6 +783,7 @@
 
 type EpollEvent struct {
 	Events uint32
+	_      int32
 	Fd     int32
 	Pad    int32
 }