diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-01-20 14:06:56 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-24 10:04:41 -0300 |
commit | 9f70985569888d68612012fcb538c47c154c1e8b (patch) | |
tree | de4f909d44053c366c19232307c4806a6a8cbffb /nptl | |
parent | d0c40833862f5cfe4d03d9130d79c1d93f284af0 (diff) | |
download | glibc-9f70985569888d68612012fcb538c47c154c1e8b.tar.gz glibc-9f70985569888d68612012fcb538c47c154c1e8b.tar.xz glibc-9f70985569888d68612012fcb538c47c154c1e8b.zip |
Consolidate pthread_atfork
The pthread_atfork is similar between Linux and Hurd, only the compat version bits differs. The generic version is place at sysdeps/pthread with a common name. It also fixes an issue with Hurd license, where the static-only object did not use LGPL + exception. Checked on x86_64-linux-gnu, i686-linux-gnu, and with a build for i686-gnu.
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/Makefile | 1 | ||||
-rw-r--r-- | nptl/old_pthread_atfork.c | 26 | ||||
-rw-r--r-- | nptl/pthread_atfork.c | 57 |
3 files changed, 0 insertions, 84 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index bbaf796771..c64e4af2f6 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -52,7 +52,6 @@ routines = \ nptl_nthreads \ nptl_setxid \ nptlfreeres \ - old_pthread_atfork \ old_pthread_cond_broadcast \ old_pthread_cond_destroy \ old_pthread_cond_init \ diff --git a/nptl/old_pthread_atfork.c b/nptl/old_pthread_atfork.c deleted file mode 100644 index 675227c559..0000000000 --- a/nptl/old_pthread_atfork.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (C) 2002-2021 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, see - <https://www.gnu.org/licenses/>. */ - -#include <shlib-compat.h> - -#if OTHER_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/nptl/pthread_atfork.c b/nptl/pthread_atfork.c deleted file mode 100644 index 6398688dab..0000000000 --- a/nptl/pthread_atfork.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (C) 2002-2021 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. - - In addition to the permissions in the GNU Lesser General Public - License, the Free Software Foundation gives you unlimited - permission to link the compiled version of this file with other - programs, and to distribute those programs without any restriction - coming from the use of this file. (The GNU Lesser General Public - License restrictions do apply in other respects; for example, they - cover modification of the file, and distribution when not linked - into another program.) - - Note that people who make modified versions of this file are not - obligated to grant this special exception for their modified - versions; it is their choice whether to do so. The GNU Lesser - General Public License gives permission to release a modified - version without this exception; this exception also makes it - possible to release a modified version which carries forward this - exception. - - 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, see - <https://www.gnu.org/licenses/>. */ - -#include "pthreadP.h" -#include <register-atfork.h> -#include <dso_handle.h> - - -/* 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 (void (*prepare) (void), void (*parent) (void), - void (*child) (void)) -{ - return __register_atfork (prepare, parent, child, __dso_handle); -} -#ifndef __pthread_atfork -extern int pthread_atfork (void (*prepare) (void), void (*parent) (void), - void (*child) (void)) attribute_hidden; -weak_alias (__pthread_atfork, pthread_atfork) -#endif |