NPTL: Move fork state variables to initializer files.

diff --git a/ChangeLog b/ChangeLog
index 216b2c9942b6808b57a0c90d8b899a90a30b6ca9..799b21a59de4904d1e123f721ffe1093ee78728c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-12-17  Roland McGrath  <roland@hack.frob.com>
 
+       * sysdeps/nptl/fork.c (__fork_generation_pointer): Variable moved ...
+       * nptl/libc_pthread_init.c: ... here.
+       * sysdeps/nptl/fork.c (__fork_handlers): Variable moved ...
+       * nptl/register-atfork.c: ... here.
+
        * sysdeps/nptl/gai_misc.h (__gai_start_notify_thread):
        Use pthread_sigmask rather than INTERNAL_SYSCALL.
        Use assert_perror to check its return value.

diff --git a/nptl/libc_pthread_init.c b/nptl/libc_pthread_init.c
index 4d8d710cca15026e178d0cbc493d8c701922817f..2bedf86300e56234770435ac1f324b5cc6ec4ba6 100644 (file)
--- a/nptl/libc_pthread_init.c
+++ b/nptl/libc_pthread_init.c
@@ -28,6 +28,9 @@
 #include <ldsodefs.h>
 
 
+unsigned long int *__fork_generation_pointer;
+
+
 #ifdef TLS_MULTIPLE_THREADS_IN_TCB
 void
 #else

diff --git a/nptl/register-atfork.c b/nptl/register-atfork.c
index 2cc49540b9507e3123d04d8eb016c2b7646f4d3a..d79f643864cc02450cdfa2aadede98f60bfb6edb 100644 (file)
--- a/nptl/register-atfork.c
+++ b/nptl/register-atfork.c
@@ -23,6 +23,8 @@
 #include <atomic.h>
 
 
+struct fork_handler *__fork_handlers;
+
 /* Lock to protect allocation and deallocation of fork handlers.  */
 int __fork_lock = LLL_LOCK_INITIALIZER;
 

diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
index 7ef693d529dc86fa76714aed6a75625b4f710fdb..dfd11698b923143e04c62051453091783c3fd50b 100644 (file)
--- a/sysdeps/nptl/fork.c
+++ b/sysdeps/nptl/fork.c
@@ -32,14 +32,6 @@
 #include <arch-fork.h>
 
 
-unsigned long int *__fork_generation_pointer;
-
-
-
-/* The single linked list of all currently registered fork handlers.  */
-struct fork_handler *__fork_handlers;
-
-
 static void
 fresetlockfiles (void)
 {