remove __SYSCALL_SSLEN arch macro in favor of using public _NSIG

the issue at hand is that many syscalls require as an argument the
kernel-ABI size of sigset_t, intended to allow the kernel to switch to
a larger sigset_t in the future. previously, each arch was defining
this size in syscall_arch.h, which was redundant with the definition
of _NSIG in bits/signal.h. as it's used in some not-quite-portable
application code as well, _NSIG is much more likely to be recognized
and understood immediately by someone reading the code, and it's also
shorter and less cluttered.

note that _NSIG is actually 65/129, not 64/128, but the division takes
care of throwing away the off-by-one part.

diff --git a/arch/arm/syscall_arch.h b/arch/arm/syscall_arch.h
index f50c3b4..1d87fae 100644 (file)
--- a/arch/arm/syscall_arch.h
+++ b/arch/arm/syscall_arch.h
@@ -3,8 +3,6 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 

-#define __SYSCALL_SSLEN 8
-

 #ifndef __clang__
 
 #define __asm_syscall(...) do { \
 #ifndef __clang__
 
 #define __asm_syscall(...) do { \

diff --git a/arch/i386/syscall_arch.h b/arch/i386/syscall_arch.h
index f2a8163..b19f27e 100644 (file)
--- a/arch/i386/syscall_arch.h
+++ b/arch/i386/syscall_arch.h
@@ -3,8 +3,6 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
 
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
 

-#define __SYSCALL_SSLEN 8
-

 static inline long __syscall0(long n)
 {
        unsigned long __ret;
 static inline long __syscall0(long n)
 {
        unsigned long __ret;

diff --git a/arch/microblaze/syscall_arch.h b/arch/microblaze/syscall_arch.h
index 5d66cb1..231bed4 100644 (file)
--- a/arch/microblaze/syscall_arch.h
+++ b/arch/microblaze/syscall_arch.h
@@ -3,8 +3,6 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 

-#define __SYSCALL_SSLEN 8
-

 #ifndef __clang__
 
 static __inline long __syscall0(long n)
 #ifndef __clang__
 
 static __inline long __syscall0(long n)

diff --git a/arch/mips/syscall_arch.h b/arch/mips/syscall_arch.h
index 7c7f9a1..43404c9 100644 (file)
--- a/arch/mips/syscall_arch.h
+++ b/arch/mips/syscall_arch.h
@@ -3,8 +3,6 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 

-#define __SYSCALL_SSLEN 16
-

 #ifndef __clang__
 
 #define __asm_syscall(...) do { \
 #ifndef __clang__
 
 #define __asm_syscall(...) do { \

diff --git a/arch/powerpc/syscall_arch.h b/arch/powerpc/syscall_arch.h
index 33ede36..21c1134 100644 (file)
--- a/arch/powerpc/syscall_arch.h
+++ b/arch/powerpc/syscall_arch.h
@@ -3,8 +3,6 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 

-#define __SYSCALL_SSLEN 8
-

 long (__syscall)(long, ...);
 
 static inline long __syscall0(long n)
 long (__syscall)(long, ...);
 
 static inline long __syscall0(long n)

diff --git a/arch/x86_64/syscall_arch.h b/arch/x86_64/syscall_arch.h
index 1c4b48a..a85c440 100644 (file)
--- a/arch/x86_64/syscall_arch.h
+++ b/arch/x86_64/syscall_arch.h
@@ -1,8 +1,6 @@
 #define __SYSCALL_LL_E(x) (x)
 #define __SYSCALL_LL_O(x) (x)
 
 #define __SYSCALL_LL_E(x) (x)
 #define __SYSCALL_LL_O(x) (x)
 

-#define __SYSCALL_SSLEN 8
-

 static __inline long __syscall0(long n)
 {
        unsigned long ret;
 static __inline long __syscall0(long n)
 {
        unsigned long ret;

diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index 544da9c..2086048 100644 (file)
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -41,7 +41,7 @@ struct pthread {
        int killlock[2];
        int exitlock[2];
        int startlock[2];
        int killlock[2];
        int exitlock[2];
        int startlock[2];

-       unsigned long sigmask[__SYSCALL_SSLEN/sizeof(long)];
+       unsigned long sigmask[_NSIG/8/sizeof(long)];

 };
 
 struct __timer {
 };
 
 struct __timer {


@@ -89,10 +89,10 @@ struct __timer {
 
 #define SIGALL_SET ((sigset_t *)(const unsigned long long [2]){ -1,-1 })
 #define SIGPT_SET \
 
 #define SIGALL_SET ((sigset_t *)(const unsigned long long [2]){ -1,-1 })
 #define SIGPT_SET \

-       ((sigset_t *)(const unsigned long [__SYSCALL_SSLEN/sizeof(long)]){ \
+       ((sigset_t *)(const unsigned long [_NSIG/8/sizeof(long)]){ \

        [sizeof(long)==4] = 3UL<<(32*(sizeof(long)>4)) })
 #define SIGTIMER_SET \
        [sizeof(long)==4] = 3UL<<(32*(sizeof(long)>4)) })
 #define SIGTIMER_SET \

-       ((sigset_t *)(const unsigned long [__SYSCALL_SSLEN/sizeof(long)]){ \
+       ((sigset_t *)(const unsigned long [_NSIG/8/sizeof(long)]){ \

         0x80000000 })
 
 pthread_t __pthread_self_init(void);
         0x80000000 })
 
 pthread_t __pthread_self_init(void);

diff --git a/src/linux/epoll.c b/src/linux/epoll.c
index 35f70ed..030786d 100644 (file)
--- a/src/linux/epoll.c
+++ b/src/linux/epoll.c
@@ -1,4 +1,5 @@
 #include <sys/epoll.h>
 #include <sys/epoll.h>

+#include <signal.h>

 #include "syscall.h"
 
 int epoll_create(int size)
 #include "syscall.h"
 
 int epoll_create(int size)


@@ -18,7 +19,7 @@ int epoll_ctl(int fd, int op, int fd2, struct epoll_event *ev)
 
 int epoll_pwait(int fd, struct epoll_event *ev, int cnt, int to, const sigset_t *sigs)
 {
 
 int epoll_pwait(int fd, struct epoll_event *ev, int cnt, int to, const sigset_t *sigs)
 {

-       return syscall(SYS_epoll_pwait, fd, ev, cnt, to, sigs, __SYSCALL_SSLEN);
+       return syscall(SYS_epoll_pwait, fd, ev, cnt, to, sigs, _NSIG/8);

 }
 
 int epoll_wait(int fd, struct epoll_event *ev, int cnt, int to)
 }
 
 int epoll_wait(int fd, struct epoll_event *ev, int cnt, int to)

diff --git a/src/linux/ppoll.c b/src/linux/ppoll.c
index f026889..9e26247 100644 (file)
--- a/src/linux/ppoll.c
+++ b/src/linux/ppoll.c
@@ -1,9 +1,10 @@
 #define _GNU_SOURCE
 #include <poll.h>
 #define _GNU_SOURCE
 #include <poll.h>

+#include <signal.h>

 #include "syscall.h"
 
 int ppoll(struct pollfd *fds, nfds_t n, const struct timespec *to, const sigset_t *mask)
 {
        return syscall_cp(SYS_ppoll, fds, n,
 #include "syscall.h"
 
 int ppoll(struct pollfd *fds, nfds_t n, const struct timespec *to, const sigset_t *mask)
 {
        return syscall_cp(SYS_ppoll, fds, n,

-               to ? (struct timespec []){*to} : 0, mask, __SYSCALL_SSLEN);
+               to ? (struct timespec []){*to} : 0, mask, _NSIG/8);

 }
 }

diff --git a/src/linux/signalfd.c b/src/linux/signalfd.c
index 1a6c03c..94de362 100644 (file)
--- a/src/linux/signalfd.c
+++ b/src/linux/signalfd.c
@@ -1,7 +1,8 @@
 #include <sys/signalfd.h>
 #include <sys/signalfd.h>

+#include <signal.h>

 #include "syscall.h"
 
 int signalfd(int fd, const sigset_t *sigs, int flags)
 {
 #include "syscall.h"
 
 int signalfd(int fd, const sigset_t *sigs, int flags)
 {

-       return syscall(SYS_signalfd, fd, sigs, __SYSCALL_SSLEN);
+       return syscall(SYS_signalfd, fd, sigs, _NSIG/8);

 }
 }

diff --git a/src/select/pselect.c b/src/select/pselect.c
index 50343fb..a19e153 100644 (file)
--- a/src/select/pselect.c
+++ b/src/select/pselect.c
@@ -1,10 +1,11 @@
 #include <sys/select.h>
 #include <sys/select.h>

+#include <signal.h>

 #include "syscall.h"
 #include "libc.h"
 
 int pselect(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec *restrict ts, const sigset_t *restrict mask)
 {
 #include "syscall.h"
 #include "libc.h"
 
 int pselect(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec *restrict ts, const sigset_t *restrict mask)
 {

-       long data[2] = { (long)mask, __SYSCALL_SSLEN };
+       long data[2] = { (long)mask, _NSIG/8 };

        struct timespec ts_tmp;
        if (ts) ts_tmp = *ts;
        return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, ts ? &ts_tmp : 0, data);
        struct timespec ts_tmp;
        if (ts) ts_tmp = *ts;
        return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, ts ? &ts_tmp : 0, data);

diff --git a/src/signal/raise.c b/src/signal/raise.c
index c0814fa..927fe26 100644 (file)
--- a/src/signal/raise.c
+++ b/src/signal/raise.c
@@ -8,10 +8,10 @@ int raise(int sig)
 {
        int pid, tid, ret;
        sigset_t set;
 {
        int pid, tid, ret;
        sigset_t set;

-       __syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGALL_SET, &set, __SYSCALL_SSLEN);
+       __syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGALL_SET, &set, _NSIG/8);

        tid = syscall(SYS_gettid);
        pid = syscall(SYS_getpid);
        ret = syscall(SYS_tgkill, pid, tid, sig);
        tid = syscall(SYS_gettid);
        pid = syscall(SYS_getpid);
        ret = syscall(SYS_tgkill, pid, tid, sig);

-       __syscall(SYS_rt_sigprocmask, SIG_SETMASK, &set, 0, __SYSCALL_SSLEN);
+       __syscall(SYS_rt_sigprocmask, SIG_SETMASK, &set, 0, _NSIG/8);

        return ret;
 }
        return ret;
 }

diff --git a/src/signal/siglongjmp.c b/src/signal/siglongjmp.c
index d0e4f67..bbdde79 100644 (file)
--- a/src/signal/siglongjmp.c
+++ b/src/signal/siglongjmp.c
@@ -6,6 +6,6 @@
 _Noreturn void siglongjmp(sigjmp_buf buf, int ret)
 {
        if (buf->__fl) __syscall(SYS_rt_sigprocmask, SIG_SETMASK,
 _Noreturn void siglongjmp(sigjmp_buf buf, int ret)
 {
        if (buf->__fl) __syscall(SYS_rt_sigprocmask, SIG_SETMASK,

-               buf->__ss, 0, __SYSCALL_SSLEN);
+               buf->__ss, 0, _NSIG/8);

        longjmp(buf->__jb, ret);
 }
        longjmp(buf->__jb, ret);
 }

diff --git a/src/signal/sigpending.c b/src/signal/sigpending.c
index 46ce303..3d193df 100644 (file)
--- a/src/signal/sigpending.c
+++ b/src/signal/sigpending.c
@@ -3,5 +3,5 @@
 
 int sigpending(sigset_t *set)
 {
 
 int sigpending(sigset_t *set)
 {

-       return syscall(SYS_rt_sigpending, set, __SYSCALL_SSLEN);
+       return syscall(SYS_rt_sigpending, set, _NSIG/8);

 }
 }

diff --git a/src/signal/sigsuspend.c b/src/signal/sigsuspend.c
index bdfaeee..0b42725 100644 (file)
--- a/src/signal/sigsuspend.c
+++ b/src/signal/sigsuspend.c
@@ -4,5 +4,5 @@
 
 int sigsuspend(const sigset_t *mask)
 {
 
 int sigsuspend(const sigset_t *mask)
 {

-       return syscall_cp(SYS_rt_sigsuspend, mask, __SYSCALL_SSLEN);
+       return syscall_cp(SYS_rt_sigsuspend, mask, _NSIG/8);

 }
 }

diff --git a/src/signal/sigtimedwait.c b/src/signal/sigtimedwait.c
index 4f8589b..0739986 100644 (file)
--- a/src/signal/sigtimedwait.c
+++ b/src/signal/sigtimedwait.c
@@ -7,7 +7,7 @@ int sigtimedwait(const sigset_t *restrict mask, siginfo_t *restrict si, const st
 {
        int ret;
        do ret = syscall_cp(SYS_rt_sigtimedwait, mask,
 {
        int ret;
        do ret = syscall_cp(SYS_rt_sigtimedwait, mask,

-               si, timeout, __SYSCALL_SSLEN);
+               si, timeout, _NSIG/8);

        while (ret<0 && errno==EINTR);
        return ret;
 }
        while (ret<0 && errno==EINTR);
        return ret;
 }

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index d11dcfa..059c20e 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -40,7 +40,7 @@ _Noreturn void pthread_exit(void *result)
                if (self->detached == 2)
                        __syscall(SYS_set_tid_address, 0);
                __syscall(SYS_rt_sigprocmask, SIG_BLOCK,
                if (self->detached == 2)
                        __syscall(SYS_set_tid_address, 0);
                __syscall(SYS_rt_sigprocmask, SIG_BLOCK,

-                       SIGALL_SET, 0, __SYSCALL_SSLEN);
+                       SIGALL_SET, 0, _NSIG/8);

                __unmapself(self->map_base, self->map_size);
        }
 
                __unmapself(self->map_base, self->map_size);
        }
 


@@ -69,11 +69,11 @@ static int start(void *p)
                        pthread_exit(0);
                }
                __syscall(SYS_rt_sigprocmask, SIG_SETMASK,
                        pthread_exit(0);
                }
                __syscall(SYS_rt_sigprocmask, SIG_SETMASK,

-                       self->sigmask, 0, __SYSCALL_SSLEN);
+                       self->sigmask, 0, _NSIG/8);

        }
        if (self->unblock_cancel)
                __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
        }
        if (self->unblock_cancel)
                __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,

-                       SIGPT_SET, 0, __SYSCALL_SSLEN);
+                       SIGPT_SET, 0, _NSIG/8);

        pthread_exit(self->start(self->start_arg));
        return 0;
 }
        pthread_exit(self->start(self->start_arg));
        return 0;
 }


@@ -171,7 +171,7 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp
        if (attr._a_sched) {
                do_sched = new->startlock[0] = 1;
                __syscall(SYS_rt_sigprocmask, SIG_BLOCK,
        if (attr._a_sched) {
                do_sched = new->startlock[0] = 1;
                __syscall(SYS_rt_sigprocmask, SIG_BLOCK,

-                       SIGALL_SET, self->sigmask, __SYSCALL_SSLEN);
+                       SIGALL_SET, self->sigmask, _NSIG/8);

        }
        new->unblock_cancel = self->cancel;
        new->canary = self->canary;
        }
        new->unblock_cancel = self->cancel;
        new->canary = self->canary;


@@ -183,7 +183,7 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp
 
        if (do_sched) {
                __syscall(SYS_rt_sigprocmask, SIG_SETMASK,
 
        if (do_sched) {
                __syscall(SYS_rt_sigprocmask, SIG_SETMASK,

-                       new->sigmask, 0, __SYSCALL_SSLEN);
+                       new->sigmask, 0, _NSIG/8);

        }
 
        if (ret < 0) {
        }
 
        if (ret < 0) {

diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c
index 23dbaa5..c50a2fb 100644 (file)
--- a/src/thread/pthread_self.c
+++ b/src/thread/pthread_self.c
@@ -9,7 +9,7 @@ weak_alias(dummy, __pthread_tsd_main);
 static int init_main_thread()
 {
        __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
 static int init_main_thread()
 {
        __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,

-               SIGPT_SET, 0, __SYSCALL_SSLEN);
+               SIGPT_SET, 0, _NSIG/8);

        if (__set_thread_area(TP_ADJ(main_thread)) < 0) return -1;
        main_thread->canceldisable = libc.canceldisable;
        main_thread->tsd = (void **)__pthread_tsd_main;
        if (__set_thread_area(TP_ADJ(main_thread)) < 0) return -1;
        main_thread->canceldisable = libc.canceldisable;
        main_thread->tsd = (void **)__pthread_tsd_main;

diff --git a/src/thread/pthread_sigmask.c b/src/thread/pthread_sigmask.c
index f6102ad..b274bd0 100644 (file)
--- a/src/thread/pthread_sigmask.c
+++ b/src/thread/pthread_sigmask.c
@@ -7,7 +7,7 @@ int pthread_sigmask(int how, const sigset_t *restrict set, sigset_t *restrict ol
 {
        int ret;
        if ((unsigned)how - SIG_BLOCK > 2U) return EINVAL;
 {
        int ret;
        if ((unsigned)how - SIG_BLOCK > 2U) return EINVAL;

-       ret = -__syscall(SYS_rt_sigprocmask, how, set, old, __SYSCALL_SSLEN);
+       ret = -__syscall(SYS_rt_sigprocmask, how, set, old, _NSIG/8);

        if (!ret && old) {
                if (sizeof old->__bits[0] == 8) {
                        old->__bits[0] &= ~0x380000000ULL;
        if (!ret && old) {
                if (sizeof old->__bits[0] == 8) {
                        old->__bits[0] &= ~0x380000000ULL;

diff --git a/src/thread/synccall.c b/src/thread/synccall.c
index dc59863..8c825ac 100644 (file)
--- a/src/thread/synccall.c
+++ b/src/thread/synccall.c
@@ -62,7 +62,7 @@ void __synccall(void (*func)(void *), void *ctx)
        __inhibit_ptc();
 
        __syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGALL_SET,
        __inhibit_ptc();
 
        __syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGALL_SET,

-               &oldmask, __SYSCALL_SSLEN);
+               &oldmask, _NSIG/8);

 
        sem_init(&chaindone, 0, 0);
        sem_init(&chainlock, 0, 1);
 
        sem_init(&chaindone, 0, 0);
        sem_init(&chainlock, 0, 1);


@@ -95,7 +95,7 @@ void __synccall(void (*func)(void *), void *ctx)
        __libc_sigaction(SIGSYNCCALL, &sa, 0);
 
        __syscall(SYS_rt_sigprocmask, SIG_SETMASK,
        __libc_sigaction(SIGSYNCCALL, &sa, 0);
 
        __syscall(SYS_rt_sigprocmask, SIG_SETMASK,

-               &oldmask, 0, __SYSCALL_SSLEN);
+               &oldmask, 0, _NSIG/8);

 
        __release_ptc();
 }
 
        __release_ptc();
 }

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index 60a18c7..6cc2bcf 100644 (file)
--- a/src/time/timer_create.c
+++ b/src/time/timer_create.c
@@ -53,7 +53,7 @@ static void install_handler()
        };
        __libc_sigaction(SIGTIMER, &sa, 0);
        __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
        };
        __libc_sigaction(SIGTIMER, &sa, 0);
        __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,

-               SIGTIMER_SET, 0, __SYSCALL_SSLEN);
+               SIGTIMER_SET, 0, _NSIG/8);

 }
 
 static void *start(void *arg)
 }
 
 static void *start(void *arg)