AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Patch [1/4] async-signal safe TLS."

Browse Source 
This reverts commit 69a17d9d24.
This commit is contained in:
Allan McRae 2014-02-05 21:21:09 +10:00
parent 8b6785f083
commit bf06bcee84
5 changed files with 0 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1044,17 +1044,6 @@
* manual/install.texi: Suppress menu for plain text output. * manual/install.texi: Suppress menu for plain text output.
* INSTALL: Regenerated. * INSTALL: Regenerated.
2013-12-18 Andrew Hunter <ahh@google.com>
* sysdeps/generic/ldsodefs.h (_dl_mask_all_signals): New prototype.
(_dl_unmask_signals): Likewise.
* sysdeps/mach/hurd/dl-sysdep.h (_dl_mask_all_signals): New stub.
(_dl_unmask_all_signals): Likewise.
* sysdeps/unix/sysv/linux/dl-sysdep.h (_dl_mask_all_signals): New prototype.
(_dl_unmask_all_signals): Likewise.
* sysdeps/unix/sysv/linux/dl-sysdep.c (_dl_mask_all_signals): New function.
(_dl_unmask_signals): Likewise.
2013-12-18 Brooks Moses <bmoses@google.com> 2013-12-18 Brooks Moses <bmoses@google.com>
[BZ #15846] [BZ #15846]

5
sysdeps/generic/ldsodefs.h
View File

@ -234,11 +234,6 @@ extern int _dl_name_match_p (const char *__name, const struct link_map *__map)
extern unsigned long int _dl_higher_prime_number (unsigned long int n) extern unsigned long int _dl_higher_prime_number (unsigned long int n)
internal_function; internal_function;
/* Mask every signal, returning the previous sigmask in OLD. */
extern void _dl_mask_all_signals (sigset_t *old) internal_function;
/* Undo _dl_mask_all_signals. */
extern void _dl_unmask_signals (sigset_t *old) internal_function;
/* Function used as argument for `_dl_receive_error' function. The /* Function used as argument for `_dl_receive_error' function. The
arguments are the error code, error string, and the objname the arguments are the error code, error string, and the objname the
error occurred in. */ error occurred in. */

7
sysdeps/mach/hurd/dl-sysdep.h
View File

@ -29,10 +29,3 @@
# define DL_ARGV_NOT_RELRO 1 # define DL_ARGV_NOT_RELRO 1
# define LIBC_STACK_END_NOT_RELRO 1 # define LIBC_STACK_END_NOT_RELRO 1
#endif #endif
#include <signal.h>
inline void _dl_mask_all_signals (sigset_t *) internal_function;
inline void _dl_mask_all_signals (sigset_t *) { }
inline void _dl_unmask_all_signals (sigset_t *) internal_function;
inline void _dl_unmask_all_signals (sigset_t *) { }

46
sysdeps/unix/sysv/linux/dl-sysdep.c
View File

@ -19,7 +19,6 @@
/* Linux needs some special initialization, but otherwise uses /* Linux needs some special initialization, but otherwise uses
the generic dynamic linker system interface code. */ the generic dynamic linker system interface code. */
#include <assert.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
@ -131,48 +130,3 @@ _dl_discover_osversion (void)
return version; 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);
}

4
sysdeps/unix/sysv/linux/dl-sysdep.h
View File

@ -30,8 +30,4 @@
/* Get version of the OS. */ /* Get version of the OS. */
extern int _dl_discover_osversion (void) attribute_hidden; extern int _dl_discover_osversion (void) attribute_hidden;
# define HAVE_DL_DISCOVER_OSVERSION 1 # define HAVE_DL_DISCOVER_OSVERSION 1
#include <signal.h>
void _dl_mask_all_signals (sigset_t *) internal_function;
void _dl_unmask_all_signals (sigset_t *) internal_function;
#endif #endif