commit 9eafafc0a87e0fd0aeeba439a4573537970c44c7
author Tonis Tiigi <tonistiigi@gmail.com> Mon Aug 12 07:25:24 2019 +0000
committer Tobias Klauser <tobias.klauser@gmail.com> Mon Aug 12 07:30:06 2019 +0000
tree a5455b781520a28b5b7b372f34f981bf92fee8cd
parent 51ab0e2deafac1f46c46ad59cf0921be2f180c3d

unix: fix epoll_event padding on riscv64

Change-Id: I88bccf0e671d350f8f57ac4d277adf4081054729
GitHub-Last-Rev: 330214261152f83f8ec4fdeaf95d1aab46b4b5fe
GitHub-Pull-Request: golang/sys#40
Reviewed-on: https://go-review.googlesource.com/c/sys/+/189877
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

unix/linux/types.go

diff --git a/unix/linux/types.go b/unix/linux/types.go
index ef13c95..f0da816 100644
--- a/unix/linux/types.go
+++ b/unix/linux/types.go
@@ -276,7 +276,7 @@
 	// 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__)
+#elif defined(__powerpc64__) || defined(__s390x__) || defined(__sparc__) || defined(__riscv)
 	int32_t _padFd;
 #endif
 	int32_t fd;

unix/ztypes_linux_riscv64.go

diff --git a/unix/ztypes_linux_riscv64.go b/unix/ztypes_linux_riscv64.go
index 8344583..ccea3e6 100644
--- a/unix/ztypes_linux_riscv64.go
+++ b/unix/ztypes_linux_riscv64.go
@@ -808,6 +808,7 @@
 
 type EpollEvent struct {
 	Events uint32
+	_      int32
 	Fd     int32
 	Pad    int32
 }