uClibc: backport an x86 compile fix from mainline (thx, swalker)
authorFelix Fietkau <nbd@openwrt.org>
Mon, 25 Jul 2011 18:26:02 +0000 (18:26 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Mon, 25 Jul 2011 18:26:02 +0000 (18:26 +0000)
SVN-Revision: 27773

toolchain/uClibc/patches-0.9.32/150-x86_epoll_fix.patch [new file with mode: 0644]

diff --git a/toolchain/uClibc/patches-0.9.32/150-x86_epoll_fix.patch b/toolchain/uClibc/patches-0.9.32/150-x86_epoll_fix.patch
new file mode 100644 (file)
index 0000000..00c44b0
--- /dev/null
@@ -0,0 +1,18 @@
+--- a/libc/sysdeps/linux/common/epoll.c
++++ b/libc/sysdeps/linux/common/epoll.c
+@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epol
+ int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
+                                               int timeout, const sigset_t *set)
+ {
++    int nsig = _NSIG / 8;
+       if (SINGLE_THREAD_P)
+-              return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++              return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ # ifdef __UCLIBC_HAS_THREADS_NATIVE__
+       else {
+               int oldtype = LIBC_CANCEL_ASYNC ();
+-              int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++              int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+               LIBC_CANCEL_RESET (oldtype);
+               return result;
+       }