aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-25 18:26:02 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-25 18:26:02 +0000
commitb857433bcb1597f99dfe728c83e6b5e647c406f5 (patch)
treebb066326773612c946b77df2af5e47db74c2b997
parent816f76457cce2290440e41e43744cb473a6f93c2 (diff)
downloadupstream-b857433bcb1597f99dfe728c83e6b5e647c406f5.tar.gz
upstream-b857433bcb1597f99dfe728c83e6b5e647c406f5.tar.bz2
upstream-b857433bcb1597f99dfe728c83e6b5e647c406f5.zip
uClibc: backport an x86 compile fix from mainline (thx, swalker)
SVN-Revision: 27773
-rw-r--r--toolchain/uClibc/patches-0.9.32/150-x86_epoll_fix.patch18
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;
+ }