summary refs log tree commit diff
path: root/malloc/set-freeres.c
diff options
context:
space:
mode:
Diffstat (limited to 'malloc/set-freeres.c')
-rw-r--r--malloc/set-freeres.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/malloc/set-freeres.c b/malloc/set-freeres.c
index f4a0e7bda4..cda368479f 100644
--- a/malloc/set-freeres.c
+++ b/malloc/set-freeres.c
@@ -26,6 +26,10 @@ 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)
 {
@@ -39,8 +43,19 @@ __libc_freeres (void)
 
       _IO_cleanup ();
 
+      /* 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);