[git commit] signal.h: provide prototype for __libc_sigaction and remove all others
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Fri Jun 15 12:00:22 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=db19d8d0a9b2ad0cd805944042137de166c4c94d
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
include/signal.h | 3 +++
libc/signal/sigaction.c | 5 -----
libc/sysdeps/linux/arm/sigaction.c | 2 --
libc/sysdeps/linux/avr32/sigaction.c | 2 --
libc/sysdeps/linux/c6x/sigaction.c | 2 --
libc/sysdeps/linux/i386/sigaction.c | 3 ---
libc/sysdeps/linux/mips/sigaction.c | 3 ---
libc/sysdeps/linux/x86_64/sigaction.c | 3 ---
libpthread/linuxthreads.old/pthread.c | 2 --
libpthread/linuxthreads.old/signals.c | 3 ---
libpthread/linuxthreads/pthread.c | 3 ---
libpthread/linuxthreads/signals.c | 3 ---
libpthread/nptl/init.c | 1 -
13 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/include/signal.h b/include/signal.h
index f2eb355..a0b3edc 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -290,7 +290,10 @@ libc_hidden_proto(sigsuspend)
/* Get and/or set the action for signal SIG. */
extern int sigaction (int __sig, __const struct sigaction *__restrict __act,
struct sigaction *__restrict __oact) __THROW;
+#ifdef _LIBC
+extern __typeof(sigaction) __libc_sigaction;
libc_hidden_proto(sigaction)
+#endif
/* Put in SET all signals that are blocked and waiting to be delivered. */
extern int sigpending (sigset_t *__set) __THROW __nonnull ((1));
diff --git a/libc/signal/sigaction.c b/libc/signal/sigaction.c
index c725c61..5a5a60c 100644
--- a/libc/signal/sigaction.c
+++ b/libc/signal/sigaction.c
@@ -24,11 +24,6 @@
#include <bits/kernel_sigaction.h>
-#ifndef LIBC_SIGACTION
-extern __typeof(sigaction) __libc_sigaction;
-#endif
-
-
#if defined __NR_rt_sigaction
/* If ACT is not NULL, change the action for SIG to *ACT.
diff --git a/libc/sysdeps/linux/arm/sigaction.c b/libc/sysdeps/linux/arm/sigaction.c
index 4fd23c5..fdb4864 100644
--- a/libc/sysdeps/linux/arm/sigaction.c
+++ b/libc/sysdeps/linux/arm/sigaction.c
@@ -29,8 +29,6 @@
extern void __default_sa_restorer(void);
extern void __default_rt_sa_restorer(void);
-extern __typeof(sigaction) __libc_sigaction;
-
/* When RT signals are in use we need to use a different return stub. */
#ifdef __NR_rt_sigreturn
#define choose_restorer(flags) \
diff --git a/libc/sysdeps/linux/avr32/sigaction.c b/libc/sysdeps/linux/avr32/sigaction.c
index f5e586c..f82d109 100644
--- a/libc/sysdeps/linux/avr32/sigaction.c
+++ b/libc/sysdeps/linux/avr32/sigaction.c
@@ -14,8 +14,6 @@
#define SA_RESTORER 0x04000000
extern void __default_rt_sa_restorer(void);
-extern __typeof(sigaction) __libc_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.
diff --git a/libc/sysdeps/linux/c6x/sigaction.c b/libc/sysdeps/linux/c6x/sigaction.c
index c65a85d..38f8204 100644
--- a/libc/sysdeps/linux/c6x/sigaction.c
+++ b/libc/sysdeps/linux/c6x/sigaction.c
@@ -31,8 +31,6 @@
#define SA_RESTORER 0x04000000
-extern __typeof(sigaction) __libc_sigaction;
-
extern void restore_rt(void) __asm__ ("__restore_rt") attribute_hidden;
extern void restore(void) __asm__ ("__restore") attribute_hidden;
diff --git a/libc/sysdeps/linux/i386/sigaction.c b/libc/sysdeps/linux/i386/sigaction.c
index a6a22de..1013fda 100644
--- a/libc/sysdeps/linux/i386/sigaction.c
+++ b/libc/sysdeps/linux/i386/sigaction.c
@@ -27,9 +27,6 @@
#define SA_RESTORER 0x04000000
-extern __typeof(sigaction) __libc_sigaction;
-
-
#if defined __NR_rt_sigaction
extern void restore_rt(void) __asm__ ("__restore_rt") attribute_hidden;
diff --git a/libc/sysdeps/linux/mips/sigaction.c b/libc/sysdeps/linux/mips/sigaction.c
index bb07eee..e6e1d69 100644
--- a/libc/sysdeps/linux/mips/sigaction.c
+++ b/libc/sysdeps/linux/mips/sigaction.c
@@ -27,9 +27,6 @@
#define SA_RESTORER 0x04000000
-extern __typeof(sigaction) __libc_sigaction;
-
-
#ifdef __NR_rt_sigaction
# if _MIPS_SIM != _ABIO32
diff --git a/libc/sysdeps/linux/x86_64/sigaction.c b/libc/sysdeps/linux/x86_64/sigaction.c
index 74e81a8..17b272c 100644
--- a/libc/sysdeps/linux/x86_64/sigaction.c
+++ b/libc/sysdeps/linux/x86_64/sigaction.c
@@ -30,9 +30,6 @@
/* We do not globally define the SA_RESTORER flag so do it here. */
#define SA_RESTORER 0x04000000
-extern __typeof(sigaction) __libc_sigaction;
-
-
#ifdef __NR_rt_sigaction
/* Using the hidden attribute here does not change the code but it
diff --git a/libpthread/linuxthreads.old/pthread.c b/libpthread/linuxthreads.old/pthread.c
index 75eb252..740877f 100644
--- a/libpthread/linuxthreads.old/pthread.c
+++ b/libpthread/linuxthreads.old/pthread.c
@@ -36,8 +36,6 @@
#include <sys/types.h>
#include <sys/syscall.h>
-/* mods for uClibc: __libc_sigaction is not in any standard headers */
-extern __typeof(sigaction) __libc_sigaction;
libpthread_hidden_proto(waitpid)
libpthread_hidden_proto(raise)
diff --git a/libpthread/linuxthreads.old/signals.c b/libpthread/linuxthreads.old/signals.c
index 23d838e..d8dbc78 100644
--- a/libpthread/linuxthreads.old/signals.c
+++ b/libpthread/linuxthreads.old/signals.c
@@ -22,9 +22,6 @@
#include "spinlock.h"
#include <bits/sigcontextinfo.h>
-/* mods for uClibc: __libc_sigaction is not in any standard headers */
-extern __typeof(sigaction) __libc_sigaction;
-
int pthread_sigmask(int how, const sigset_t * newmask, sigset_t * oldmask)
{
sigset_t mask;
diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c
index 66efe3a..ade21dc 100644
--- a/libpthread/linuxthreads/pthread.c
+++ b/libpthread/linuxthreads/pthread.c
@@ -37,9 +37,6 @@
# error "This must not happen"
#endif
-/* mods for uClibc: __libc_sigaction is not in any standard headers */
-extern __typeof(sigaction) __libc_sigaction;
-
#if !(USE_TLS && HAVE___THREAD)
/* These variables are used by the setup code. */
extern int _errno;
diff --git a/libpthread/linuxthreads/signals.c b/libpthread/linuxthreads/signals.c
index 61b411a..672b8e4 100644
--- a/libpthread/linuxthreads/signals.c
+++ b/libpthread/linuxthreads/signals.c
@@ -20,9 +20,6 @@
#include "internals.h"
#include "spinlock.h"
-/* mods for uClibc: __libc_sigaction is not in any standard headers */
-extern __typeof(sigaction) __libc_sigaction;
-
int pthread_sigmask(int how, const sigset_t * newmask, sigset_t * oldmask)
{
sigset_t mask;
diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c
index c8ca096..379c4bb 100644
--- a/libpthread/nptl/init.c
+++ b/libpthread/nptl/init.c
@@ -35,7 +35,6 @@
#include <lowlevellock.h>
#include <bits/kernel-features.h>
#include <stdio.h>
-extern __typeof(sigaction) __libc_sigaction;
/* Size and alignment of static TLS block. */
size_t __static_tls_size;
More information about the uClibc-cvs
mailing list