diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/pthread_atfork.c | 8 | ||||
| -rw-r--r-- | nptl/tst-atfork2mod.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/nptl/pthread_atfork.c b/nptl/pthread_atfork.c index dc2ea07887..f1aa2b3cf1 100644 --- a/nptl/pthread_atfork.c +++ b/nptl/pthread_atfork.c @@ -35,10 +35,7 @@ #include "pthreadP.h" #include <fork.h> - -/* This is defined by newer gcc version unique for each module. */ -extern void *__dso_handle __attribute__ ((__weak__, - __visibility__ ("hidden"))); +#include <dso_handle.h> /* Hide the symbol so that no definition but the one locally in the @@ -51,8 +48,7 @@ attribute_hidden __pthread_atfork (void (*prepare) (void), void (*parent) (void), void (*child) (void)) { - return __register_atfork (prepare, parent, child, - &__dso_handle == NULL ? NULL : __dso_handle); + return __register_atfork (prepare, parent, child, __dso_handle); } #ifndef __pthread_atfork extern int pthread_atfork (void (*prepare) (void), void (*parent) (void), diff --git a/nptl/tst-atfork2mod.c b/nptl/tst-atfork2mod.c index fe64046d3c..ea47d5825a 100644 --- a/nptl/tst-atfork2mod.c +++ b/nptl/tst-atfork2mod.c @@ -19,6 +19,7 @@ #include <pthread.h> #include <stdio.h> #include <stdlib.h> +#include <dso_handle.h> extern int val; @@ -46,7 +47,6 @@ static void __attribute__ ((constructor)) init (void) { - extern void *__dso_handle; printf ("dsohandle = %p\n", __dso_handle); if (pthread_atfork (prepare, parent, child) != 0) |