1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

uclibc: fix compile error on i586

Without this you get:

| 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

(From OE-Core rev: aeacad638c2a3d5f0b6299edc3890fdaad312c79)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Phil Blundell
2011-06-10 14:56:09 +01:00
committed by Richard Purdie
parent ef8144b934
commit 194c6721d0
2 changed files with 26 additions and 0 deletions
@@ -0,0 +1,25 @@
Fix a compile error due to last argument to syscall() not being memory addressable.
Upstream-Status: Pending
Signed-off-by: Phil Blundell <philb@gnu.org>
diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
index 85b0cfd..c034b2c 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
View File
@@ -26,5 +26,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
file://remove_attribute_optimize_Os.patch \
file://append_UCLIBC_EXTRA_CFLAGS.patch \
file://compile-arm-fork-with-O2.patch \
file://epoll-asm-fix.patch \
"
S = "${WORKDIR}/git"