qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 05:11:11 +02:00
Code

[uClibc 0.9.29 0.9.30.1] Add the missing 5th arg to the ppoll syscall.

Browse Source 
Fixes the uclibc error that ppoll returns -EINVAL.
Thanks to Geoff Levand <geoffrey.levand@am.sony.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16166 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hcg 2009-05-29 07:40:29 +00:00
parent f2f110a1ea
commit 9c278041ab
2 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
toolchain/uClibc/patches-0.9.29/300-fix-ppoll.diff Normal file
View File

@ -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)

38
toolchain/uClibc/patches-0.9.30.1/300-fix-ppoll.diff Normal file
View File

@ -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)