diff options
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/nptl/Makefile.in | 6 | ||||
| -rw-r--r-- | libpthread/nptl/old_pthread_atfork.c | 27 | ||||
| -rw-r--r-- | libpthread/nptl/pthread_atfork.c | 11 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c | 29 |
4 files changed, 2 insertions, 71 deletions
diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in index 53f684d39..45f3bd1f2 100644 --- a/libpthread/nptl/Makefile.in +++ b/libpthread/nptl/Makefile.in @@ -64,7 +64,7 @@ libpthread-routines = init vars events version \ pthread_cancel pthread_testcancel \ pthread_setcancelstate pthread_setcanceltype \ pthread_once \ - old_pthread_atfork pthread_atfork \ + pthread_atfork \ pthread_getcpuclockid \ pthread_clock_gettime pthread_clock_settime \ sem_init sem_destroy \ @@ -94,7 +94,6 @@ libpthread-routines = init vars events version \ cleanup_routine unwind-forcedunwind libpthread-shared-only-routines = version pt-allocrtsig unwind-forcedunwind -libpthread-static-only-routines = pthread_atfork CFLAGS-pthread_atfork.c = -DNOT_IN_libc @@ -234,8 +233,7 @@ libpthread_a_SRC = $(patsubst %, $(libpthread_DIR)/%.c, \ $(libpthread-routines))) libpthread_so_SRC = $(patsubst %, $(libpthread_DIR)/%.c, \ $(filter-out $(libpthread-os-routines) \ - $(libpthread-misc-routines) \ - $(libpthread-static-only-routines), $(libpthread-routines))) + $(libpthread-misc-routines), $(libpthread-routines))) libc-a-y += $(patsubst %.c, $(libpthread_OUT)/%.o, alloca_cutoff.c \ forward.c libc-cancellation.c) diff --git a/libpthread/nptl/old_pthread_atfork.c b/libpthread/nptl/old_pthread_atfork.c deleted file mode 100644 index 768e6876c..000000000 --- a/libpthread/nptl/old_pthread_atfork.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. - - 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 <shlib-compat.h> - -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3) -# define __pthread_atfork __dyn_pthread_atfork -# include "pthread_atfork.c" -# undef __pthread_atfork -compat_symbol (libpthread, __dyn_pthread_atfork, pthread_atfork, GLIBC_2_0); -#endif diff --git a/libpthread/nptl/pthread_atfork.c b/libpthread/nptl/pthread_atfork.c index 6437d6490..e0fc3cf75 100644 --- a/libpthread/nptl/pthread_atfork.c +++ b/libpthread/nptl/pthread_atfork.c @@ -41,13 +41,6 @@ extern void *__dso_handle __attribute__ ((__weak__)); -/* Hide the symbol so that no definition but the one locally in the - executable or DSO is used. */ -int -#ifndef __pthread_atfork -/* Don't mark the compatibility function as hidden. */ -attribute_hidden -#endif __pthread_atfork (prepare, parent, child) void (*prepare) (void); void (*parent) (void); @@ -56,8 +49,4 @@ __pthread_atfork (prepare, parent, child) return __register_atfork (prepare, parent, child, &__dso_handle == NULL ? NULL : __dso_handle); } -#ifndef __pthread_atfork -extern int pthread_atfork (void (*prepare) (void), void (*parent) (void), - void (*child) (void)) attribute_hidden; strong_alias (__pthread_atfork, pthread_atfork) -#endif diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c index a3bb3c34c..18b9893d9 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c @@ -106,32 +106,3 @@ __register_atfork (prepare, parent, child, dso_handle) return newp == NULL ? ENOMEM : 0; } -hidden_def (__register_atfork) - - -#ifndef __UCLIBC__ -libc_freeres_fn (free_mem) -{ - /* Get the lock to not conflict with running forks. */ - lll_lock (__fork_lock); - - /* No more fork handlers. */ - __fork_handlers = NULL; - - /* Free eventually alloated memory blocks for the object pool. */ - struct fork_handler_pool *runp = fork_handler_pool.next; - - memset (&fork_handler_pool, '\0', sizeof (fork_handler_pool)); - - /* Release the lock. */ - lll_unlock (__fork_lock); - - /* We can free the memory after releasing the lock. */ - while (runp != NULL) - { - struct fork_handler_pool *oldp = runp; - runp = runp->next; - free (oldp); - } -} -#endif |