aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHamish Guthrie <hcg@openwrt.org>2009-05-29 07:40:29 +0000
committerHamish Guthrie <hcg@openwrt.org>2009-05-29 07:40:29 +0000
commit0c592ec7b3e1dbf99b3efd8ff22bb945d7d83774 (patch)
tree0c6a69650c02f59460caf784f63961b356f18a02
parent01392262c19ad4ecb7c3416de717de781a65d8bb (diff)
downloadupstream-0c592ec7b3e1dbf99b3efd8ff22bb945d7d83774.tar.gz
upstream-0c592ec7b3e1dbf99b3efd8ff22bb945d7d83774.tar.bz2
upstream-0c592ec7b3e1dbf99b3efd8ff22bb945d7d83774.zip
Add the missing 5th arg to the ppoll syscall. Fixes the uclibc error that ppoll returns -EINVAL. Thanks to Geoff Levand <geoffrey.levand@am.sony.com>
SVN-Revision: 16166
-rw-r--r--toolchain/uClibc/patches-0.9.29/300-fix-ppoll.diff39
-rw-r--r--toolchain/uClibc/patches-0.9.30.1/300-fix-ppoll.diff38
2 files changed, 77 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches-0.9.29/300-fix-ppoll.diff b/toolchain/uClibc/patches-0.9.29/300-fix-ppoll.diff
new file mode 100644
index 0000000000..125eb148ed
--- /dev/null
+++ b/toolchain/uClibc/patches-0.9.29/300-fix-ppoll.diff
@@ -0,0 +1,39 @@
+
+It will match kernel's sigset_t starting from 0.9.31.
+
+Please try attached patch.
+--
+vda
+
+diff -d -urpN uClibc.0/libc/sysdeps/linux/common/ppoll.c uClibc.1/libc/sysdeps/linux/common/ppoll.c
+--- uClibc.0/libc/sysdeps/linux/common/ppoll.c
++++ uClibc.1/libc/sysdeps/linux/common/ppoll.c
+@@ -17,6 +17,7 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#include <signal.h>
+ #include <sys/syscall.h>
+ #include <sys/poll.h>
+
+@@ -26,9 +27,9 @@
+
+ # define __NR___libc_ppoll __NR_ppoll
+ static inline
+-_syscall4(int, __libc_ppoll, struct pollfd *, fds,
++_syscall5(int, __libc_ppoll, struct pollfd *, fds,
+ nfds_t, nfds, const struct timespec *, timeout,
+- const __sigset_t *, sigmask);
++ const __sigset_t *, sigmask, size_t, sigsetsize)
+
+ int
+ ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
+@@ -43,7 +44,7 @@
+ timeout = &tval;
+ }
+
+- return __libc_ppoll(fds, nfds, timeout, sigmask);
++ return __libc_ppoll(fds, nfds, timeout, sigmask, _NSIG / 8);
+ }
+ libc_hidden_def(ppoll)
+
diff --git a/toolchain/uClibc/patches-0.9.30.1/300-fix-ppoll.diff b/toolchain/uClibc/patches-0.9.30.1/300-fix-ppoll.diff
new file mode 100644
index 0000000000..c2970daf69
--- /dev/null
+++ b/toolchain/uClibc/patches-0.9.30.1/300-fix-ppoll.diff
@@ -0,0 +1,38 @@
+
+It will match kernel's sigset_t starting from 0.9.31.
+
+Please try attached patch.
+--
+vda
+
+--- uClibc.0/libc/sysdeps/linux/common/ppoll.c
++++ uClibc.1/libc/sysdeps/linux/common/ppoll.c
+@@ -17,6 +17,7 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#include <signal.h>
+ #include <sys/syscall.h>
+ #include <sys/poll.h>
+
+@@ -26,9 +27,9 @@
+
+ # define __NR___libc_ppoll __NR_ppoll
+ static __always_inline
+-_syscall4(int, __libc_ppoll, struct pollfd *, fds,
++_syscall5(int, __libc_ppoll, struct pollfd *, fds,
+ nfds_t, nfds, const struct timespec *, timeout,
+- const __sigset_t *, sigmask)
++ const __sigset_t *, sigmask, size_t, sigsetsize)
+
+ int
+ ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
+@@ -43,7 +44,7 @@
+ timeout = &tval;
+ }
+
+- return __libc_ppoll(fds, nfds, timeout, sigmask);
++ return __libc_ppoll(fds, nfds, timeout, sigmask, _NSIG / 8);
+ }
+ libc_hidden_def(ppoll)
+