Merge branch 'master-glibc-2.21' into master-glibc-2.22

1 files changed, 5 insertions, 1 deletions

diff --git a/sysdeps/generic/pt-atfork.c b/sysdeps/generic/pt-atfork.c
index ce72e10..304d7ef 100644
--- a/sysdeps/generic/pt-atfork.c
+++ b/sysdeps/generic/pt-atfork.c
@@ -20,10 +20,14 @@
 #include <pthread.h>
 #include <pt-internal.h>
 
+/* This is defined by newer gcc version unique for each module.  */
+extern void *__dso_handle __attribute__ ((__weak__,
+					  __visibility__ ("hidden")));
+
 int
 pthread_atfork (void (*prepare) (void),
 		void (*parent) (void),
 		void (*child) (void))
 {
-  return __register_atfork (prepare, parent, child);
+  return __register_atfork (prepare, parent, child, &__dso_handle == NULL ? NULL : __dso_handle);
 }