diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-01-29 15:46:50 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-01-29 18:23:10 +0100 |
| commit | fba639dcdcc2f3fede71e8bcd1a1a525a7f57d61 (patch) | |
| tree | 9da29168d05b6b90d984fb19e33c0e2b7f906058 | |
| parent | 29962e14a1144ec4f9cfac8ab8a51af2b5692317 (diff) | |
handle signal-OBXSI.SUSv4.syms
A couple of sig functions are obsolete in SUSv4.
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | include/signal.h | 4 | ||||
| -rw-r--r-- | libc/signal/Makefile.in | 4 | ||||
| -rw-r--r-- | test/nptl/Makefile.in | 2 | ||||
| -rw-r--r-- | test/pthread/cancellation-points.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/include/signal.h b/include/signal.h index 37ed29780..dc8679477 100644 --- a/include/signal.h +++ b/include/signal.h @@ -168,7 +168,7 @@ extern int gsignal (int __sig) __THROW; extern void psignal (int __sig, __const char *__s); #endif /* Use misc. */ - +#ifdef __UCLIBC_SUSV4_LEGACY__ /* The `sigpause' function has two different interfaces. The original BSD definition defines the argument as a mask of the signal, while the more modern interface in X/Open defines it as the signal @@ -191,7 +191,7 @@ extern int sigpause (int __mask) __THROW __attribute_deprecated__; # define sigpause(sig) __sigpause ((sig), 1) # endif #endif - +#endif /* __UCLIBC_SUSV4_LEGACY__ */ #ifdef __USE_BSD /* None of the following functions should be used anymore. They are here diff --git a/libc/signal/Makefile.in b/libc/signal/Makefile.in index 46c2af79b..1eaa9f07a 100644 --- a/libc/signal/Makefile.in +++ b/libc/signal/Makefile.in @@ -10,11 +10,11 @@ subdirs += libc/signal CSRC-y := allocrtsig.c killpg.c raise.c sigaction.c sigaddset.c sigandset.c \ sigblock.c sigdelset.c sigempty.c sigfillset.c siggetmask.c \ sigisempty.c sigismem.c sigjmp.c signal.c \ - sigorset.c sigpause.c sigsetmask.c sigsetops.c sigwait.c + sigorset.c sigsetmask.c sigsetops.c sigwait.c CSRC-$(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL) += \ sighold.c sigignore.c sigrelse.c sigset.c CSRC-$(UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL) += sysv_signal.c -CSRC-$(UCLIBC_SUSV4_LEGACY) += sigintr.c +CSRC-$(UCLIBC_SUSV4_LEGACY) += sigintr.c sigpause.c ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) CSRC-y:=$(filter-out raise.c,$(CSRC-y)) diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in index b91480250..976034d4c 100644 --- a/test/nptl/Makefile.in +++ b/test/nptl/Makefile.in @@ -59,7 +59,7 @@ TESTS_DISABLED += tst-exec2 tst-exec3 tst-exec4 endif ifeq ($(UCLIBC_SUSV4_LEGACY),) -TESTS_DISABLED += tst-basic5 +TESTS_DISABLED += tst-basic5 tst-cancel4 tst-cancel5 tst-cancelx4 endif GLIBC_TESTS_DISABLED := tst-eintr1_glibc tst-eintr2_glibc \ diff --git a/test/pthread/cancellation-points.c b/test/pthread/cancellation-points.c index c7e784e4f..5453060f7 100644 --- a/test/pthread/cancellation-points.c +++ b/test/pthread/cancellation-points.c @@ -141,7 +141,9 @@ MAKE_CANCEL_THREAD_FUNC_EX(sem_wait, (&sem), help_sem_setup()) MAKE_CANCEL_THREAD_FUNC(send, (-1, NULL, 0, 0)) MAKE_CANCEL_THREAD_FUNC(sendmsg, (-1, NULL, 0)) MAKE_CANCEL_THREAD_FUNC(sendto, (-1, NULL, 0, 0, NULL, 0)) +#ifdef __UCLIBC_SUSV4_LEGACY__ MAKE_CANCEL_THREAD_FUNC(sigpause, (0)) +#endif MAKE_CANCEL_THREAD_FUNC(sigsuspend, (NULL)) MAKE_CANCEL_THREAD_FUNC(sigtimedwait, (NULL, NULL, NULL)) MAKE_CANCEL_THREAD_FUNC(sigwait, (NULL, NULL)) |