summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--src/signal/restore.c10
-rw-r--r--src/signal/sigaction.c21
3 files changed, 18 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 1bdea61e..0c134175 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ CFLAGS = -Os -pipe
CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc
CFLAGS_ALL = $(CFLAGS_C99FSE)
-CFLAGS_ALL += -D_XOPEN_SOURCE=700 -I./src/internal -I./include -I./arch/$(ARCH)
+CFLAGS_ALL += -D_XOPEN_SOURCE=700 -I./arch/$(ARCH) -I./src/internal -I./include
CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS)
CFLAGS_ALL_STATIC = $(CFLAGS_ALL)
CFLAGS_ALL_SHARED = $(CFLAGS_ALL) -fPIC -DSHARED -O3
diff --git a/src/signal/restore.c b/src/signal/restore.c
index e69de29b..873b867e 100644
--- a/src/signal/restore.c
+++ b/src/signal/restore.c
@@ -0,0 +1,10 @@
+/* These functions will not work, but suffice for targets where the
+ * kernel sigaction structure does not actually use sa_restorer. */
+
+void __restore()
+{
+}
+
+void __restore_rt()
+{
+}
diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 5bc9383b..089e9b80 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -4,6 +4,7 @@
#include "syscall.h"
#include "pthread_impl.h"
#include "libc.h"
+#include "ksigaction.h"
void __restore(), __restore_rt();
@@ -12,28 +13,20 @@ weak_alias(dummy, __pthread_self_def);
int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
{
- struct {
- void *handler;
- unsigned long flags;
- void (*restorer)(void);
- sigset_t mask;
- } ksa, kold;
- long pksa=0, pkold=0;
+ struct k_sigaction ksa, *pksa=0;
if (sa) {
ksa.handler = sa->sa_handler;
ksa.flags = sa->sa_flags | SA_RESTORER;
ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
- ksa.mask = sa->sa_mask;
- pksa = (long)&ksa;
+ memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask);
}
- if (old) pkold = (long)&kold;
__pthread_self_def();
- if (syscall(SYS_rt_sigaction, sig, pksa, pkold, 8))
+ if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa:0, sizeof ksa.mask))
return -1;
if (old) {
- old->sa_handler = kold.handler;
- old->sa_flags = kold.flags;
- old->sa_mask = kold.mask;
+ old->sa_handler = ksa.handler;
+ old->sa_flags = ksa.flags;
+ memcpy(&old->sa_mask, &ksa.mask, sizeof ksa.mask);
}
return 0;
}