From 330214261152f83f8ec4fdeaf95d1aab46b4b5fe Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Sun, 11 Aug 2019 07:57:21 -0700 Subject: [PATCH] unix: fix epoll_event padding on riscv64 --- unix/linux/types.go | 2 +- unix/ztypes_linux_riscv64.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/unix/linux/types.go b/unix/linux/types.go index ef13c95a2..f0da81641 100644 --- a/unix/linux/types.go +++ b/unix/linux/types.go @@ -276,7 +276,7 @@ struct my_epoll_event { // 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; diff --git a/unix/ztypes_linux_riscv64.go b/unix/ztypes_linux_riscv64.go index 8344583e7..ccea3e638 100644 --- a/unix/ztypes_linux_riscv64.go +++ b/unix/ztypes_linux_riscv64.go @@ -808,6 +808,7 @@ type Ustat_t struct { type EpollEvent struct { Events uint32 + _ int32 Fd int32 Pad int32 }