Permalink
Browse files

uClibc: backport an x86 compile fix from mainline (thx, swalker)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27773 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information...
1 parent f8277b1 commit a8907a627255b33768fb06d76aea4369234116ff nbd committed Jul 25, 2011
Showing with 18 additions and 0 deletions.
  1. +18 −0 toolchain/uClibc/patches-0.9.32/150-x86_epoll_fix.patch
@@ -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;
+ }

0 comments on commit a8907a6

Please sign in to comment.