signal: Add __libc_sigaction

The generic implementation basically handle the system agnostic logic
(filtering out the invalid signals) while the __libc_sigaction is
the function with implements the system and architecture bits.

Checked on x86_64-linux-gnu and i686-linux-gnu.

10 files changed, 12 insertions, 17 deletions

diff --git a/sysdeps/mach/hurd/sigaction.c b/sysdeps/mach/hurd/libc_sigaction.c
index ab91e122b9..29547e2d6a 100644
--- a/sysdeps/mach/hurd/sigaction.c
+++ b/sysdeps/mach/hurd/libc_sigaction.c
@@ -24,16 +24,15 @@
 /* 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
-__sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
+__libc_sigaction (int sig, const struct sigaction *act,
+		  struct sigaction *oact)
 {
   struct hurd_sigstate *ss;
   struct sigaction a, old;
   sigset_t pending;
 
-  if (sig <= 0 || sig >= NSIG
-      || (act != NULL && act->sa_handler != SIG_DFL
-	  && ((__sigmask (sig) & _SIG_CANT_MASK)
-	      || act->sa_handler == SIG_ERR)))
+  if (act != NULL && act->sa_handler != SIG_DFL
+      && ((__sigmask (sig) & _SIG_CANT_MASK) || act->sa_handler == SIG_ERR))
     {
       errno = EINVAL;
       return -1;
@@ -87,5 +86,4 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
 
   return 0;
 }
-libc_hidden_def (__sigaction)
-weak_alias (__sigaction, sigaction)
+libc_hidden_def (__libc_sigaction)
diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index 7209c24110..341eec20f1 100644
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -74,7 +74,6 @@ setsid		-	setsid		i:	__setsid	setsid
 setsockopt	-	setsockopt	i:iiibn	setsockopt	__setsockopt
 setuid		-	setuid		i:i	__setuid	setuid
 shutdown	-	shutdown	i:ii	shutdown
-sigaction	-	sigaction	i:ipp	__sigaction	sigaction
 sigsuspend	-	sigsuspend	Ci:p	sigsuspend
 socket		-	socket		i:iii	__socket	socket
 socketpair	-	socketpair	i:iiif	socketpair
diff --git a/sysdeps/unix/sysv/linux/aarch64/sigaction.c b/sysdeps/unix/sysv/linux/aarch64/libc_sigaction.c
index 6f44866ce1..a2a2a17fe9 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sigaction.c
+++ b/sysdeps/unix/sysv/linux/aarch64/libc_sigaction.c
@@ -27,4 +27,4 @@
 #define RESET_SA_RESTORER(act, kact)		\
   (act)->sa_restorer = (kact)->sa_restorer;
 
-#include <sysdeps/unix/sysv/linux/sigaction.c>
+#include <sysdeps/unix/sysv/linux/libc_sigaction.c>
diff --git a/sysdeps/unix/sysv/linux/arc/sigaction.c b/sysdeps/unix/sysv/linux/arc/libc_sigaction.c
index 2807f74b1b..26da42f04f 100644
--- a/sysdeps/unix/sysv/linux/arc/sigaction.c
+++ b/sysdeps/unix/sysv/linux/arc/libc_sigaction.c
@@ -28,4 +28,4 @@ extern void __default_rt_sa_restorer (void);
 
 #define RESET_SA_RESTORER(act, kact)
 
-#include <sysdeps/unix/sysv/linux/sigaction.c>
+#include <sysdeps/unix/sysv/linux/libc_sigaction.c>
diff --git a/sysdeps/unix/sysv/linux/arm/sigaction.c b/sysdeps/unix/sysv/linux/arm/libc_sigaction.c
index 76a9abebf3..de061312d5 100644
--- a/sysdeps/unix/sysv/linux/arm/sigaction.c
+++ b/sysdeps/unix/sysv/linux/arm/libc_sigaction.c
@@ -36,4 +36,4 @@ extern void __default_rt_sa_restorer (void);
 #define RESET_SA_RESTORER(act, kact)				\
   (act)->sa_restorer = (kact)->sa_restorer;
 
-#include <sysdeps/unix/sysv/linux/sigaction.c>
+#include <sysdeps/unix/sysv/linux/libc_sigaction.c>
diff --git a/sysdeps/unix/sysv/linux/i386/sigaction.c b/sysdeps/unix/sysv/linux/i386/libc_sigaction.c
index 46aeca252d..1d6457612a 100644
--- a/sysdeps/unix/sysv/linux/i386/sigaction.c
+++ b/sysdeps/unix/sysv/linux/i386/libc_sigaction.c
@@ -39,7 +39,7 @@ extern void restore (void) asm ("__restore") attribute_hidden;
 #define RESET_SA_RESTORER(act, kact) \
   (act)->sa_restorer = (kact)->sa_restorer
 
-#include <sysdeps/unix/sysv/linux/sigaction.c>
+#include <sysdeps/unix/sysv/linux/libc_sigaction.c>
 
 /* NOTE: Please think twice before making any changes to the bits of
    code below.  GDB needs some intimate knowledge about it to
diff --git a/sysdeps/unix/sysv/linux/sigaction.c b/sysdeps/unix/sysv/linux/libc_sigaction.c
index 38088f9a85..21fe657d1f 100644
--- a/sysdeps/unix/sysv/linux/sigaction.c
+++ b/sysdeps/unix/sysv/linux/libc_sigaction.c
@@ -70,5 +70,3 @@ __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
   return result;
 }
 libc_hidden_def (__libc_sigaction)
-
-#include <nptl/sigaction.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c b/sysdeps/unix/sysv/linux/sparc/sparc32/libc_sigaction.c
index f1e07fbb7c..09a052fc05 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc_sigaction.c
@@ -34,4 +34,4 @@ void __sigreturn_stub (void);
 	: 0,						\
   (sigsetsize)
 
-#include <sysdeps/unix/sysv/linux/sigaction.c>
+#include <sysdeps/unix/sysv/linux/libc_sigaction.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c b/sysdeps/unix/sysv/linux/sparc/sparc64/libc_sigaction.c
index 2e7f940a4e..6cfcf0a4cb 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc_sigaction.c
@@ -29,4 +29,4 @@ void __rt_sigreturn_stub (void);
   (((unsigned long) &__rt_sigreturn_stub) - 8),	\
   (sigsetsize)
 
-#include <sysdeps/unix/sysv/linux/sigaction.c>
+#include <sysdeps/unix/sysv/linux/libc_sigaction.c>
diff --git a/sysdeps/unix/sysv/linux/x86_64/sigaction.c b/sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c
index b295037db7..21367e97c1 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sigaction.c
+++ b/sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c
@@ -30,7 +30,7 @@ extern void restore_rt (void) asm ("__restore_rt") attribute_hidden;
 
 #include <kernel_sigaction.h>
 
-#include <sysdeps/unix/sysv/linux/sigaction.c>
+#include <sysdeps/unix/sysv/linux/libc_sigaction.c>
 
 /* NOTE: Please think twice before making any changes to the bits of
    code below.  GDB needs some intimate knowledge about it to