From bf06bcee84d4c19a99925c0f58026a8cbd87a688 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 5 Feb 2014 21:21:09 +1000 Subject: Revert "Patch [1/4] async-signal safe TLS." This reverts commit 69a17d9d245dc3551792e95e1823cc2d877592f3. --- sysdeps/unix/sysv/linux/dl-sysdep.c | 46 ------------------------------------- sysdeps/unix/sysv/linux/dl-sysdep.h | 4 ---- 2 files changed, 50 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c index 676c9b246f..28100742f5 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/dl-sysdep.c @@ -19,7 +19,6 @@ /* Linux needs some special initialization, but otherwise uses the generic dynamic linker system interface code. */ -#include #include #include #include @@ -131,48 +130,3 @@ _dl_discover_osversion (void) return version; } - -/* Mask every signal, returning the previous sigmask in OLD. */ -void -internal_function -_dl_mask_all_signals (sigset_t *old) -{ - int ret; - sigset_t new; - - sigfillset (&new); - - /* This function serves as a replacement to pthread_sigmask, which - isn't available from within the dynamic linker since it would require - linking with libpthread. We duplicate some of the functionality here - to avoid requiring libpthread. This isn't quite identical to - pthread_sigmask in that we do not mask internal signals used for - cancellation and setxid handling. This disables asynchronous - cancellation for the duration the signals are disabled, but it's a - small window, and prevents any problems with the use of TLS variables - in the signal handlers that would have executed. */ - - /* It's very important we don't touch errno here, as that's TLS; since this - gets called from get_tls_addr we might end up recursing. */ - - INTERNAL_SYSCALL_DECL (err); - - ret = INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &new, old, - _NSIG / 8); - - assert (ret == 0); -} - -/* Return sigmask to what it was before a call to _dl_mask_all_signals. */ -void -internal_function -_dl_unmask_signals (sigset_t *old) -{ - int ret; - INTERNAL_SYSCALL_DECL (err); - - ret = INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, old, NULL, - _NSIG / 8); - - assert (ret == 0); -} diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.h b/sysdeps/unix/sysv/linux/dl-sysdep.h index 8e39c83217..096019f2a1 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.h +++ b/sysdeps/unix/sysv/linux/dl-sysdep.h @@ -30,8 +30,4 @@ /* Get version of the OS. */ extern int _dl_discover_osversion (void) attribute_hidden; # define HAVE_DL_DISCOVER_OSVERSION 1 - -#include -void _dl_mask_all_signals (sigset_t *) internal_function; -void _dl_unmask_all_signals (sigset_t *) internal_function; #endif -- cgit 1.4.1