diff options
| author | Phil Blundell <pb@pbcl.net> | 2011-06-11 01:10:46 -0400 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-23 15:49:02 +0100 |
| commit | 08164f6a9e839918fa6bae05572916c2defabd94 (patch) | |
| tree | 06d28c581f267efb21dc7eb4f09e97d386d8b5a7 | |
| parent | 5ca71ddc69ebb3696b63d260e15341653ddef4c0 (diff) | |
| download | uClibc-alpine-08164f6a9e839918fa6bae05572916c2defabd94.tar.bz2 uClibc-alpine-08164f6a9e839918fa6bae05572916c2defabd94.tar.xz | |
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>
(cherry picked from commit 8245f3b4638fdff2011c2657af1bb211def704bc)
| -rw-r--r-- | libc/sysdeps/linux/common/epoll.c | 5 |
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; } |