From a4d3e96cf6f26ac1d3e381e7e81ed6f19a900164 Mon Sep 17 00:00:00 2001 From: Razvan Virtan Date: Mon, 4 Oct 2021 19:33:46 +0300 Subject: [PATCH 1/2] Remove signal related stubs from glue.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 4 signal related functions are now provided trough uksignal. Remove the stubs from glue.c to avoid linking errors. Signed-off-by: Răzvan Vîrtan --- glue.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/glue.c b/glue.c index 60a12bd..bc054af 100644 --- a/glue.c +++ b/glue.c @@ -100,30 +100,6 @@ int settimeofday(const struct timeval *tv __unused, const struct timezone *tz __ return 0; } -#undef sigaddset -int sigaddset(sigset_t *set __unused, int signum __unused) -{ - return 0; -} - -#undef sigdelset -int sigdelset(sigset_t *set __unused, int signum __unused) -{ - return 0; -} - -#undef sigemptyset -int sigemptyset(sigset_t *set __unused) -{ - return 0; -} - -#undef sigfillset -int sigfillset(sigset_t *set __unused) -{ - return 0; -} - ssize_t sendfile64(int out_fd __unused, int in_fd __unused, off_t *offset __unused, size_t count __unused) { return 1; From 432f22bb93fc90965b34357fca425adc5f112835 Mon Sep 17 00:00:00 2001 From: Razvan Virtan Date: Mon, 4 Oct 2021 20:21:19 +0300 Subject: [PATCH 2/2] Remove real time signals references MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At this moment uksignal doesn't support real time signals (signal codes greater than 31). However, the Go runtime assumes that it does and it tries to init signals up to SIGRTMAX, causing any go application to fail. This commit avoids this situation. These changes should be removed when real time signals support will be added to uksignal. Signed-off-by: Răzvan Vîrtan --- generated/runtime_sysinfo.go | 3 +- generated/sigtab.go | 67 ++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/generated/runtime_sysinfo.go b/generated/runtime_sysinfo.go index 67702d5..1133ae9 100644 --- a/generated/runtime_sysinfo.go +++ b/generated/runtime_sysinfo.go @@ -2408,7 +2408,8 @@ const __POSIX_SYNCHRONIZED_IO = 200809 const _SYS_close = ___NR_close const _PR_SET_UNALIGN = 6 const _SYS_brk = ___NR_brk -const __NSIG = (___SIGRTMAX + 1) +// FIXME : const __NSIG=(___SIGRTMAX + 1) when RT signals are added to uksignal +const __NSIG = 32 const __POSIX_FD_SETSIZE = __POSIX_OPEN_MAX const _ENOTTY = 25 const _RTA_PRIORITY = 6 diff --git a/generated/sigtab.go b/generated/sigtab.go index 06b46af..08a026e 100644 --- a/generated/sigtab.go +++ b/generated/sigtab.go @@ -35,37 +35,38 @@ var sigtable = [...]sigTabT{ _SIGSTKFLT: {_SigThrow + _SigUnblock, "SIGSTKFLT: stack fault"}, _SIGPWR: {_SigNotify, "SIGPWR: power failure restart"}, _SIGPOLL: {_SigNotify, "SIGPOLL: pollable event occurred"}, - 32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */ - 33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */ - 34: {_SigNotify, "signal 34"}, - 35: {_SigNotify, "signal 35"}, - 36: {_SigNotify, "signal 36"}, - 37: {_SigNotify, "signal 37"}, - 38: {_SigNotify, "signal 38"}, - 39: {_SigNotify, "signal 39"}, - 40: {_SigNotify, "signal 40"}, - 41: {_SigNotify, "signal 41"}, - 42: {_SigNotify, "signal 42"}, - 43: {_SigNotify, "signal 43"}, - 44: {_SigNotify, "signal 44"}, - 45: {_SigNotify, "signal 45"}, - 46: {_SigNotify, "signal 46"}, - 47: {_SigNotify, "signal 47"}, - 48: {_SigNotify, "signal 48"}, - 49: {_SigNotify, "signal 49"}, - 50: {_SigNotify, "signal 50"}, - 51: {_SigNotify, "signal 51"}, - 52: {_SigNotify, "signal 52"}, - 53: {_SigNotify, "signal 53"}, - 54: {_SigNotify, "signal 54"}, - 55: {_SigNotify, "signal 55"}, - 56: {_SigNotify, "signal 56"}, - 57: {_SigNotify, "signal 57"}, - 58: {_SigNotify, "signal 58"}, - 59: {_SigNotify, "signal 59"}, - 60: {_SigNotify, "signal 60"}, - 61: {_SigNotify, "signal 61"}, - 62: {_SigNotify, "signal 62"}, - 63: {_SigNotify, "signal 63"}, - 64: {_SigNotify, "signal 64"}, + // FIXME: uncomment when RT signals support is added to uksignal + // 32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */ + // 33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */ + // 34: {_SigNotify, "signal 34"}, + // 35: {_SigNotify, "signal 35"}, + // 36: {_SigNotify, "signal 36"}, + // 37: {_SigNotify, "signal 37"}, + // 38: {_SigNotify, "signal 38"}, + // 39: {_SigNotify, "signal 39"}, + // 40: {_SigNotify, "signal 40"}, + // 41: {_SigNotify, "signal 41"}, + // 42: {_SigNotify, "signal 42"}, + // 43: {_SigNotify, "signal 43"}, + // 44: {_SigNotify, "signal 44"}, + // 45: {_SigNotify, "signal 45"}, + // 46: {_SigNotify, "signal 46"}, + // 47: {_SigNotify, "signal 47"}, + // 48: {_SigNotify, "signal 48"}, + // 49: {_SigNotify, "signal 49"}, + // 50: {_SigNotify, "signal 50"}, + // 51: {_SigNotify, "signal 51"}, + // 52: {_SigNotify, "signal 52"}, + // 53: {_SigNotify, "signal 53"}, + // 54: {_SigNotify, "signal 54"}, + // 55: {_SigNotify, "signal 55"}, + // 56: {_SigNotify, "signal 56"}, + // 57: {_SigNotify, "signal 57"}, + // 58: {_SigNotify, "signal 58"}, + // 59: {_SigNotify, "signal 59"}, + // 60: {_SigNotify, "signal 60"}, + // 61: {_SigNotify, "signal 61"}, + // 62: {_SigNotify, "signal 62"}, + // 63: {_SigNotify, "signal 63"}, + // 64: {_SigNotify, "signal 64"}, }