hurd: Fix build

[thirdparty/glibc.git] / malloc / set-freeres.c

diff --git a/malloc/set-freeres.c b/malloc/set-freeres.c
index 1c0733ec194824c1a00e0dc00527a907f0f984f7..c9387888e1d5ad5d324d8a63028b6a6a313b83dd 100644 (file)
--- a/malloc/set-freeres.c
+++ b/malloc/set-freeres.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -12,23 +12,24 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <atomic.h>
 #include <stdlib.h>
 #include <set-hooks.h>
 #include <libc-internal.h>
 
-#ifdef USE_IN_LIBIO
-# include "../libio/libioP.h"
-#endif
+#include "../libio/libioP.h"
 
 DEFINE_HOOK (__libc_subfreeres, (void));
 
 symbol_set_define (__libc_freeres_ptrs);
 
+extern __attribute__ ((weak)) void __libdl_freeres (void);
+
+extern __attribute__ ((weak)) void __libpthread_freeres (void);
+
 void __libc_freeres_fn_section
 __libc_freeres (void)
 {
@@ -36,19 +37,28 @@ __libc_freeres (void)
      protect for multiple executions since these are fatal.  */
   static long int already_called;
 
-  if (! atomic_compare_and_exchange_acq (&already_called, 1, 0))
+  if (!atomic_compare_and_exchange_bool_acq (&already_called, 1, 0))
     {
-      void * const *p;
+      void *const *p;
 
-#ifdef USE_IN_LIBIO
       _IO_cleanup ();
-#endif
 
+      /* We run the resource freeing after IO cleanup.  */
       RUN_HOOK (__libc_subfreeres, ());
 
+      /* Call the libdl list of cleanup functions
+        (weak-ref-and-check).  */
+      if (&__libdl_freeres != NULL)
+       __libdl_freeres ();
+
+      /* Call the libpthread list of cleanup functions
+        (weak-ref-and-check).  */
+      if (&__libpthread_freeres != NULL)
+       __libpthread_freeres ();
+
       for (p = symbol_set_first_element (__libc_freeres_ptrs);
-          ! symbol_set_end_p (__libc_freeres_ptrs, p); ++p)
-       free (*p);
+           !symbol_set_end_p (__libc_freeres_ptrs, p); ++p)
+        free (*p);
     }
 }
 libc_hidden_def (__libc_freeres)