sigsuspend.c: add cancellation support independently of rt_sigsuspend

signal.h: add __SYSCALL_SIGSET_T_SIZE, since kernel sigset_t is different
on mips and use that instead of _NSIG / 8

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

include/signal.h

@@ -299,7 +299,10 @@ libc_hidden_proto(sigprocmask)
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern int sigsuspend (__const sigset_t *__set) __nonnull ((1));
+#ifdef _LIBC
+extern __typeof(sigsuspend) __sigsuspend_nocancel attribute_hidden;
 libc_hidden_proto(sigsuspend)
+#endif
 
 /* Get and/or set the action for signal SIG.  */
 extern int sigaction (int __sig, __const struct sigaction *__restrict __act,
@@ -325,6 +328,16 @@ extern int __syscall_rt_sigaction(int, __const struct sigaction *,
 	;
 extern __typeof(sigaction) __libc_sigaction;
 libc_hidden_proto(sigaction)
+
+# ifdef __mips__
+#  define _KERNEL_NSIG_WORDS (_NSIG / _MIPS_SZLONG)
+typedef struct {
+	unsigned long sig[_KERNEL_NSIG_WORDS];
+} kernel_sigset_t;
+#  define __SYSCALL_SIGSET_T_SIZE (sizeof(kernel_sigset_t))
+# else
+#  define __SYSCALL_SIGSET_T_SIZE (_NSIG / 8)
+# endif
 #endif
 
 /* Put in SET all signals that are blocked and waiting to be delivered.  */

libc/sysdeps/linux/common/sigsuspend.c

@@ -11,42 +11,16 @@
 
 #ifdef __USE_POSIX
 #include <signal.h>
+#include <cancel.h>
 
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
-# ifndef __NR_rt_sigsuspend
-#  error break build, NPTL needs rt_sigsuspend syscall
-# endif
-# include <sysdep-cancel.h>
-#else
-# define SINGLE_THREAD_P 1
-#endif
-
-#ifdef __NR_rt_sigsuspend
-static _syscall2(int, rt_sigsuspend, const sigset_t *, set, size_t, size)
-
-/* Change the set of blocked signals to SET,
-   wait until a signal arrives, and restore the set of blocked signals.  */
-int sigsuspend(const sigset_t *set)
+int __NC(sigsuspend)(const sigset_t *set)
 {
-	if (SINGLE_THREAD_P)
-		return rt_sigsuspend(set, _NSIG / 8);
-
-# ifdef __UCLIBC_HAS_THREADS_NATIVE__
-	int oldtype = LIBC_CANCEL_ASYNC ();
-	int result = rt_sigsuspend(set, _NSIG / 8);
-	LIBC_CANCEL_RESET (oldtype);
-	return result;
-# endif
-}
+#ifdef __NR_rt_sigsuspend
+	return INLINE_SYSCALL(rt_sigsuspend, 2, set, __SYSCALL_SIGSET_T_SIZE);
 #else
-# define __NR___syscall_sigsuspend __NR_sigsuspend
-static __always_inline _syscall3(int, __syscall_sigsuspend, int, a, unsigned long int, b,
-				 unsigned long int, c)
-
-int sigsuspend(const sigset_t *set)
-{
-	return __syscall_sigsuspend(0, 0, set->__val[0]);
-}
+	return INLINE_SYSCALL(sigsuspend, 3, 0, 0, set->__val[0]);
 #endif
-libc_hidden_def(sigsuspend)
+}
+CANCELLABLE_SYSCALL(int, sigsuspend, (const sigset_t *set), (set))
+lt_libc_hidden(sigsuspend)
 #endif