summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
Diffstat (limited to 'malloc')
-rw-r--r--malloc/Makefile4
-rw-r--r--malloc/Versions3
-rw-r--r--malloc/thread-freeres.c30
3 files changed, 35 insertions, 2 deletions
diff --git a/malloc/Makefile b/malloc/Makefile
index 78855c0f0d..6c04518b39 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1991-1999,2000,2001,2002,2003 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
@@ -52,7 +52,7 @@ libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
 extra-objs = mcheck-init.o libmcheck.a
 
 # Include the cleanup handler.
-aux := set-freeres
+aux := set-freeres thread-freeres
 
 include ../Makeconfig
 
diff --git a/malloc/Versions b/malloc/Versions
index bef99d31dc..0c578f95b6 100644
--- a/malloc/Versions
+++ b/malloc/Versions
@@ -58,5 +58,8 @@ libc {
   GLIBC_PRIVATE {
     # Internal startup hook for libpthread.
     __libc_malloc_pthread_startup;
+
+    # Internal destructor hook for libpthread.
+    __libc_thread_freeres;
   }
 }
diff --git a/malloc/thread-freeres.c b/malloc/thread-freeres.c
new file mode 100644
index 0000000000..75d3014d6e
--- /dev/null
+++ b/malloc/thread-freeres.c
@@ -0,0 +1,30 @@
+/* Free resources stored in thread-local variables on thread exit.
+   Copyright (C) 2003 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   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.  */
+
+#include <stdlib.h>
+#include <libc-internal.h>
+#include <set-hooks.h>
+
+DEFINE_HOOK (__libc_thread_subfreeres, (void));
+
+void __attribute__ ((section ("__libc_thread_freeres_fn")))
+__libc_thread_freeres (void)
+{
+  RUN_HOOK (__libc_thread_subfreeres, ());
+}