From 825adeeed1e95990fd1efb70d9ac3eb7f1ea802a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 26 Sep 2017 16:53:25 -0700 Subject: 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): 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 . (mtrace): Pass __dso_handle directly. * nptl/pthread_atfork.c: Include . (__dso_handle): Remove declaration. (__pthread_atfork): Pass __dso_handle directly. * nptl/tst-atfork2mod.c: Include . (__dso_handle): Removed. * posix/wordexp-test.c: Include . (__dso_handle): Remove declaration. (__app_register_atfork): Pass __dso_handle directly. * stdlib/at_quick_exit.c: Include . (__dso_handle): Remove declaration. (at_quick_exit): Pass __dso_handle directly. * stdlib/atexit.c: Include . (__dso_handle): Remove declaration. (atexit): Pass __dso_handle directly. * stdlib/tst-tls-atexit-lib.c: Include . (__dso_handle): Removed. --- stdlib/atexit.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'stdlib/atexit.c') diff --git a/stdlib/atexit.c b/stdlib/atexit.c index f28b6ba..aaecb4a 100644 --- a/stdlib/atexit.c +++ b/stdlib/atexit.c @@ -33,13 +33,9 @@ . */ #include +#include #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 `exit'. */ int #ifndef atexit @@ -47,6 +43,5 @@ attribute_hidden #endif atexit (void (*func) (void)) { - return __cxa_atexit ((void (*) (void *)) func, NULL, - &__dso_handle == NULL ? NULL : __dso_handle); + return __cxa_atexit ((void (*) (void *)) func, NULL, __dso_handle); } -- cgit v1.1