diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-07-25 18:26:02 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-07-25 18:26:02 +0000 |
| commit | 9909b62a8cf75d4778b878b475420e605b08c137 (patch) | |
| tree | 5120a23c3fa2724af1e43f90759e1cdd2d86d38a /toolchain/uClibc | |
| parent | a648edde9f2c90f98f5549121e3e6def09e27fc2 (diff) | |
| download | upstream-9909b62a8cf75d4778b878b475420e605b08c137.tar.gz upstream-9909b62a8cf75d4778b878b475420e605b08c137.tar.bz2 upstream-9909b62a8cf75d4778b878b475420e605b08c137.zip | |
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
Diffstat (limited to 'toolchain/uClibc')
| -rw-r--r-- | toolchain/uClibc/patches-0.9.32/150-x86_epoll_fix.patch | 18 |
1 files changed, 18 insertions, 0 deletions
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 index 0000000000..00c44b04f2 --- /dev/null +++ b/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; + } |