diff options
| author | Phil Blundell <pb@pbcl.net> | 2011-06-10 14:56:09 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-14 13:23:49 +0100 |
| commit | aeacad638c2a3d5f0b6299edc3890fdaad312c79 (patch) | |
| tree | 531d4cc069afaaa944e65d15088415f00bfad032 | |
| parent | 4091e811c04245d53bc1bb82087e3e476c7c8c1a (diff) | |
| download | openembedded-core-aeacad638c2a3d5f0b6299edc3890fdaad312c79.tar.gz openembedded-core-aeacad638c2a3d5f0b6299edc3890fdaad312c79.tar.bz2 openembedded-core-aeacad638c2a3d5f0b6299edc3890fdaad312c79.zip | |
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
Signed-off-by: Phil Blundell <philb@gnu.org>
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch | 25 | ||||
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc_git.bb | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch b/meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch new file mode 100644 index 0000000000..bcd834d618 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch @@ -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; + } diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb index 78ef4f28d9..b8f58f0095 100644 --- a/meta/recipes-core/uclibc/uclibc_git.bb +++ b/meta/recipes-core/uclibc/uclibc_git.bb @@ -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" |