summary refs log tree commit diff
path: root/stdlib
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2021-03-24 21:27:34 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2021-03-29 21:41:09 +0200
commit64786a7090d104a2e4e2e225b1eff08951fe008a (patch)
tree9498fe2a6f2504910df83a3c68c1307f3fb9f2ce /stdlib
parente4fda4631017e49d4ee5a2755db34289b6860fa4 (diff)
downloadglibc-64786a7090d104a2e4e2e225b1eff08951fe008a.tar.gz
glibc-64786a7090d104a2e4e2e225b1eff08951fe008a.tar.xz
glibc-64786a7090d104a2e4e2e225b1eff08951fe008a.zip
fork.h: replace with register-atfork.h
UNREGISTER_ATFORK is now defined for all ports in register-atfork.h, so most
previous includes of fork.h actually only need register-atfork.h now, and
cxa_finalize.c does not need an ifdef UNREGISTER_ATFORK any more.

The nptl-specific fork generation counters can then go to pthreadP.h, and
fork.h be removed.

Checked on x86_64-linux-gnu and i686-gnu.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/cxa_finalize.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/stdlib/cxa_finalize.c b/stdlib/cxa_finalize.c
index 7d7b09b3cc..75ea4022fb 100644
--- a/stdlib/cxa_finalize.c
+++ b/stdlib/cxa_finalize.c
@@ -18,7 +18,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include "exit.h"
-#include <fork.h>
+#include <register-atfork.h>
 #include <sysdep.h>
 #include <stdint.h>
 
@@ -102,9 +102,7 @@ __cxa_finalize (void *d)
 
   /* Remove the registered fork handlers.  We do not have to
      unregister anything if the program is going to terminate anyway.  */
-#ifdef UNREGISTER_ATFORK
   if (d != NULL)
     UNREGISTER_ATFORK (d);
-#endif
   __libc_lock_unlock (__exit_funcs_lock);
 }