Add in arm specific sigaction implementation to fix sa_restorer

behavior so it works as expected

3 files changed, 159 insertions, 2 deletions

diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index 8cd0efa47..540d2b30c 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -28,10 +28,11 @@ ASFLAGS=$(CFLAGS)
 CRT0_SRC = crt0.S
 CRT0_OBJ = crt0.o crt1.o
 
-SSRC=__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S bsd-_setjmp.S
+SSRC=__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \
+	bsd-_setjmp.S sigrestorer.S
 SOBJS=$(patsubst %.S,%.o, $(SSRC))
 
-CSRC=brk.c syscall.c ioperm.c
+CSRC=brk.c syscall.c ioperm.c sigaction.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(MOBJ) $(COBJS)
diff --git a/libc/sysdeps/linux/arm/sigaction.c b/libc/sysdeps/linux/arm/sigaction.c
new file mode 100644
index 000000000..5efd7f2a8
--- /dev/null
+++ b/libc/sysdeps/linux/arm/sigaction.c
@@ -0,0 +1,116 @@
+/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  
+
+   Totally hacked up for uClibc by Erik Andersen <andersen@codepoet.org>
+   */
+
+#include <errno.h>
+#include <signal.h>
+#include <string.h>
+#include <sys/syscall.h>
+#include <bits/kernel_sigaction.h>
+
+#define SA_RESTORER	0x04000000
+extern void __default_sa_restorer(void);
+extern void __default_rt_sa_restorer(void);
+
+#if defined __NR_rt_sigaction
+
+/* If ACT is not NULL, change the action for SIG to *ACT.
+   If OACT is not NULL, put the old action for SIG in *OACT.  */
+int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
+{
+    int result;
+    struct kernel_sigaction kact, koact;
+
+    if (act) {
+	kact.k_sa_handler = act->sa_handler;
+	memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask));
+	kact.sa_flags = act->sa_flags;
+# ifdef HAVE_SA_RESTORER
+	if (kact.sa_flags & (SA_RESTORER | SA_ONSTACK)) {
+	    kact.sa_restorer = act->sa_restorer;
+	} else {
+	    if (kact.sa_flags & SA_SIGINFO) {
+		kact.sa_restorer = __default_rt_sa_restorer;
+	    } else {
+		kact.sa_restorer = __default_sa_restorer;
+		kact.sa_flags |= SA_RESTORER;
+	    }
+	}
+# endif
+    }
+
+    /* XXX The size argument hopefully will have to be changed to the
+       real size of the user-level sigset_t.  */
+    result = __rt_sigaction(sig, act ? __ptrvalue (&kact) : NULL,
+	    oact ? __ptrvalue (&koact) : NULL, _NSIG / 8);
+
+    if (oact && result >= 0) {
+	oact->sa_handler = koact.k_sa_handler;
+	memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (oact->sa_mask));
+	oact->sa_flags = koact.sa_flags;
+# ifdef HAVE_SA_RESTORER
+	oact->sa_restorer = koact.sa_restorer;
+# endif
+    }
+    return result;
+}
+
+
+#else
+
+/* If ACT is not NULL, change the action for SIG to *ACT.
+   If OACT is not NULL, put the old action for SIG in *OACT.  */
+int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
+{
+    int result;
+    struct old_kernel_sigaction kact, koact;
+
+    if (act) {
+	kact.k_sa_handler = act->sa_handler;
+	kact.sa_mask = act->sa_mask.__val[0];
+	kact.sa_flags = act->sa_flags;
+# ifdef HAVE_SA_RESTORER
+	/* See the comments above for why we test SA_ONSTACK.  */
+	if (kact.sa_flags & (SA_RESTORER | SA_ONSTACK)) {
+	    kact.sa_restorer = act->sa_restorer;
+	} else {
+	    kact.sa_restorer = __default_sa_restorer;
+	    kact.sa_flags |= SA_RESTORER;
+	}
+# endif
+    }
+    result = __sigaction(sig, act ? __ptrvalue (&kact) : NULL,
+	    oact ? __ptrvalue (&koact) : NULL);
+
+    if (oact && result >= 0) {
+	oact->sa_handler = koact.k_sa_handler;
+	oact->sa_mask.__val[0] = koact.sa_mask;
+	oact->sa_flags = koact.sa_flags;
+# ifdef HAVE_SA_RESTORER
+	oact->sa_restorer = koact.sa_restorer;
+# endif
+    }
+    return result;
+}
+
+#endif
+
+weak_alias(__libc_sigaction, sigaction)
+
diff --git a/libc/sysdeps/linux/arm/sigrestorer.S b/libc/sysdeps/linux/arm/sigrestorer.S
new file mode 100644
index 000000000..a90881eb0
--- /dev/null
+++ b/libc/sysdeps/linux/arm/sigrestorer.S
@@ -0,0 +1,40 @@
+/* Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sys/syscall.h>
+
+/* If no SA_RESTORER function was specified by the application we use
+   one of these.  This avoids the need for the kernel to synthesise a return
+   instruction on the stack, which would involve expensive cache flushes. */
+
+.globl __default_sa_restorer;
+.type __default_sa_restorer,%function
+.align 4;
+__default_sa_restorer:
+	swi	__NR_sigreturn
+
+
+#ifdef __NR_rt_sigreturn
+
+.globl __default_rt_sa_restorer;
+.type __default_rt_sa_restorer,%function
+.align 4;
+__default_rt_sa_restorer:
+	swi	__NR_rt_sigreturn
+
+#endif