summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2011-06-11 01:10:46 -0400
committerKhem Raj <raj.khem@gmail.com>2011-06-10 23:59:29 -0700
commit8245f3b4638fdff2011c2657af1bb211def704bc (patch)
tree22fb0f0765a8282d4e1423267159f3c049334a08
parent9a923848c48330ad6c96dc457402eafc2463dd7c (diff)
Fix __libc_epoll_pwait compile failure on x86
This prevents "memory input 7 is not directly addressable" errors. | libc/sysdeps/linux/common/epoll.c: In function '__libc_epoll_pwait': | libc/sysdeps/linux/common/epoll.c:71:80: error: memory input 7 is not directly addressable | libc/sysdeps/linux/common/epoll.c:75:86: error: memory input 7 is not directly addressable | make: *** [libc/sysdeps/linux/common/epoll.o] Error 1 | make: *** Waiting for unfinished jobs.... Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Jason Woodward <jason.woodward@timesys.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--libc/sysdeps/linux/common/epoll.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
index 85b0cfd2b..ab3e73bb7 100644
--- a/libc/sysdeps/linux/common/epoll.c
+++ b/libc/sysdeps/linux/common/epoll.c
@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
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;
}