diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2017-09-26 16:53:25 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2017-09-26 16:53:44 -0700 |
commit | 825adeeed1e95990fd1efb70d9ac3eb7f1ea802a (patch) | |
tree | 4002af56c7bd48974db937cdc3fbe7c2d7ecc290 /stdlib/at_quick_exit.c | |
parent | bfb0deb3554204cbba10d61d96cad355e4ca5623 (diff) | |
download | glibc-825adeeed1e95990fd1efb70d9ac3eb7f1ea802a.tar.gz glibc-825adeeed1e95990fd1efb70d9ac3eb7f1ea802a.tar.xz glibc-825adeeed1e95990fd1efb70d9ac3eb7f1ea802a.zip |
Mark __dso_handle as hidden [BZ #18822]
Since __dso_handle is always defined by either crtbegin.o from GCC or dso_handle.c, it should be marked as hidden and be passed directly. [BZ #18822] * dlfcn/modatexit.c (foo): Remove __dso_handle check. * dlfcn/modcxaatexit.c: Include <dso_handle.h>. (__dso_handle): Remove declaration. * dlfcn/tstatexit.c (__dso_handle): Removed. (main): Don't check __dso_handle. * dlfcn/tstcxaatexit.c (__dso_handle): Removed. (main): Don't check __dso_handle. * include/dso_handle.h: New file. * malloc/mtrace.c: Include <dso_handle.h>. (mtrace): Pass __dso_handle directly. * nptl/pthread_atfork.c: Include <dso_handle.h>. (__dso_handle): Remove declaration. (__pthread_atfork): Pass __dso_handle directly. * nptl/tst-atfork2mod.c: Include <dso_handle.h>. (__dso_handle): Removed. * posix/wordexp-test.c: Include <dso_handle.h>. (__dso_handle): Remove declaration. (__app_register_atfork): Pass __dso_handle directly. * stdlib/at_quick_exit.c: Include <dso_handle.h>. (__dso_handle): Remove declaration. (at_quick_exit): Pass __dso_handle directly. * stdlib/atexit.c: Include <dso_handle.h>. (__dso_handle): Remove declaration. (atexit): Pass __dso_handle directly. * stdlib/tst-tls-atexit-lib.c: Include <dso_handle.h>. (__dso_handle): Removed.
Diffstat (limited to 'stdlib/at_quick_exit.c')
-rw-r--r-- | stdlib/at_quick_exit.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/stdlib/at_quick_exit.c b/stdlib/at_quick_exit.c index 3b74d0a688..0f1c1fde9e 100644 --- a/stdlib/at_quick_exit.c +++ b/stdlib/at_quick_exit.c @@ -33,18 +33,14 @@ <http://www.gnu.org/licenses/>. */ #include <stdlib.h> +#include <dso_handle.h> #include "exit.h" -/* This is defined by newer gcc version unique for each module. */ -extern void *__dso_handle __attribute__ ((__weak__)); - - /* Register FUNC to be executed by `quick_exit'. */ int attribute_hidden at_quick_exit (void (*func) (void)) { - return __cxa_at_quick_exit ((void (*) (void *)) func, - &__dso_handle == NULL ? NULL : __dso_handle); + return __cxa_at_quick_exit ((void (*) (void *)) func, __dso_handle); } |