diff options
Diffstat (limited to 'main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch')
| -rw-r--r-- | main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch b/main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch deleted file mode 100644 index 2377bccbd8..0000000000 --- a/main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 08164f6a9e839918fa6bae05572916c2defabd94 Mon Sep 17 00:00:00 2001 -From: Phil Blundell <pb@pbcl.net> -Date: Sat, 11 Jun 2011 01:10:46 -0400 -Subject: [PATCH] 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) ---- - 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 85b0cfd..ab3e73b 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; - } --- -1.7.8 - |